Merge branch 'bug-1226' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:26:08 +0000 (20:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jul 2014 18:26:08 +0000 (20:26 +0200)
1  2 
includes/notary.inc.php
www/wot.php

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