Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 9 Jun 2015 20:55:22 +0000 (22:55 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 9 Jun 2015 20:55:22 +0000 (22:55 +0200)
commitde1eeb532805380bf7a747582c94fdfc62ce3401
tree38641cfa85e58eff87e181848815a4faa08f1c72
parent52063341061ad1fa6907d055c769a3323c837032
parenteadb03311454c5dc6234c45a76eb5943612568e0
Merge branch 'bug-1042' into testserver-stable
includes/notary.inc.php
pages/account/43.php