Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 18:43:52 +0000 (20:43 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 18:43:52 +0000 (20:43 +0200)
commita3d3111e9fd4def0103f3f2701f19a07991d7a1a
tree7638cf6f6dda1bfc977a7f11b5cfb32a79b3c13e
parent06a25c7e2ea8a2e7bf607389fd77b630bf774b6e
parentf2ae0815c65d2c99fba4a3e20d4765343f9050f3
Merge branch 'bug-1042' into testserver-stable
includes/notary.inc.php