Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
authorMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 15:04:44 +0000 (17:04 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 15:04:44 +0000 (17:04 +0200)
1  2 
includes/notary.inc.php

Simple merge