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)
commitf543973bfaa3ed1c393e4b1df022511b5c11e795
tree5fc124a81dda70c710a20496c8fcb7e840a3e512
parent90a9b6b26dbef01dfc0c16a43cafb3e0636c3e25
parentacd4f0f92cc29cd3c622d11fc2f5e61c97401a51
Merge branch 'bug-893' into merge-bug-1177-893-1136-1123-1137
includes/notary.inc.php