Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:38 +0000 (22:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 20:50:38 +0000 (22:50 +0200)
commit8c8642a6de5533906270111d4592569b64cefc15
treeb7e9c558ff41c1204a152115ebcbb7720a5e6eeb
parentdabfc656c18e1888481b52345660a238f158cae9
parentcdf3dc9fb536596c55470a6541b6f393686a35fa
Merge branch 'bug-1042' into testserver-stable
includes/notary.inc.php
www/wot.php