Merge branch 'bug-1316' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Oct 2014 08:03:06 +0000 (09:03 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Oct 2014 08:03:06 +0000 (09:03 +0100)
1  2 
includes/notary.inc.php

Simple merge