Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137
authorBenny Baumann <BenBE@geshi.org>
Tue, 13 Aug 2013 19:14:27 +0000 (21:14 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 13 Aug 2013 19:14:27 +0000 (21:14 +0200)
commite4d5df60c1c443d0e4a516cc9aa5d5d7cdb0b55a
tree7d6a142704c71ad6784d4b676a329e0a179a2f49
parent4193c98693d25611e2b99d975d70bd06e1417a95
parent33bd853d0e7034f1ad0755dd717655b650ba541f
Merge branch 'bug-1137' into merge-bug-1177-893-1136-1123-1137

Conflicts:
includes/notary.inc.php
includes/notary.inc.php