Merge branch 'bug-1177' into bug-893
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:38:31 +0000 (23:38 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:38:31 +0000 (23:38 +0200)
commit56e830101351d98510a01a664a34951b2fef9af8
tree38e86c99b65f9a1ce8e5c9c6b45691d37092d680
parent32bec6416a6f6e40b912a707830b6c7385a9a056
parentd4f46a86d354f1f434e0a6b2f16a4d5fef96b9fa
Merge branch 'bug-1177' into bug-893
includes/notary.inc.php