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)
1  2 
includes/notary.inc.php
www/wot.php

Simple merge
diff --cc www/wot.php
Simple merge