Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
authorBenny Baumann <BenBE@geshi.org>
Tue, 13 Aug 2013 19:25:28 +0000 (21:25 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 13 Aug 2013 19:25:28 +0000 (21:25 +0200)
commit90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25
treec869a8f3af7ded6a5e943a813f18c7a517561c9d
parente4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a
parent75693292de2d907bf2a4b0f12abd7cd68781f95a
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137

Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php