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)
1  2 
includes/notary.inc.php

Simple merge