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

Simple merge