Merge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137
authorMichael Tänzer <neo@nhng.de>
Wed, 14 Aug 2013 19:41:51 +0000 (21:41 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 14 Aug 2013 19:41:51 +0000 (21:41 +0200)
1  2 
includes/notary.inc.php

Simple merge