Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 14:52:24 +0000 (16:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 14:52:24 +0000 (16:52 +0200)
commit448b50cdd201b7924c8c1c162f141c9294966a6d
treeab34251562c401164798f66aa44f9fd699eca9e6
parent1881b5db7cb46fb437b1696c4821332c2eb911a8
parent9a4b2c917cac95618a6b9babc0d3b570702928da
Merge branch 'bug-1042' into testserver-stable
includes/notary.inc.php
www/wot.php