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)
commitc34d0d386d2efb408cdc2dbd512a67ca259abea3
treec55d8f57521066371b11cb4c7b21a7f03c281d9e
parentf543973bfaa3ed1c393e4b1df022511b5c11e795
parentff8e88c54bcbfad0084834f82b798b8a3f35817d
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
includes/notary.inc.php