Merge branch 'bug-1316' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 28 Oct 2014 20:44:05 +0000 (21:44 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 28 Oct 2014 20:44:05 +0000 (21:44 +0100)
commit0ffc97cbe1e0c4796022ea69f7dbbb1a8f02336b
tree087a0e55a08c9c50c0df0741650d66498ac7c97a
parent350a2f0df6d80e2667a7698ffd1fc613229fab54
parent20a5109644ca501f8a1e501af37416c8409a5ba8
Merge branch 'bug-1316' into testserver-stable
includes/notary.inc.php
pages/account/43.php