Merge branch 'bug-1361' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 21 Jan 2015 09:05:41 +0000 (10:05 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 21 Jan 2015 09:05:41 +0000 (10:05 +0100)
commiteb1b77d8c2dc32b1ec6e280822eb9e85f27d77a4
tree28b6cb8562e5e5c307caaf985959b17c1049620b
parent85589ff948973586ad4d0dea2e8e458f007fc0ea
parent315ff4a4c39366af339d2a5c27ce20c6704432e4
Merge branch 'bug-1361' into testserver-stable
includes/account_stuff.php
www/gpg.php