Merge branch 'bug-1177' into bug-1137
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:39:34 +0000 (23:39 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Jul 2013 21:39:34 +0000 (23:39 +0200)
commit33bd853d0e7034f1ad0755dd717655b650ba541f
treed108a1d9a489ffad6e603f27c5908af37021141d
parent5ee8783a5b5012d89ce3ea040a8ad5a14fb2dbbe
parentd4f46a86d354f1f434e0a6b2f16a4d5fef96b9fa
Merge branch 'bug-1177' into bug-1137
includes/notary.inc.php