Merge branch 'bug-1316' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Oct 2014 08:10:59 +0000 (09:10 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Oct 2014 08:10:59 +0000 (09:10 +0100)
commitcd8a00093b9aaa4de29c8e06796d5dcf56401bc8
treebcc22acc76ba8e148fd86dce9ffa12fda1a6818e
parent52dfc5b3a270bc14f8ffa0710815695e447274b7
parentb513efab245b17945e09ece0290f1d5f4fe13f85
Merge branch 'bug-1316' into testserver-stable
includes/notary.inc.php