Merge remote-tracking branch 'origin/bug-1137' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:03:11 +0000 (01:03 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:03:11 +0000 (01:03 +0100)
1  2 
includes/notary.inc.php
pages/wot/6.php

Simple merge
diff --cc pages/wot/6.php
Simple merge