Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:39:20 +0000 (20:39 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:39:20 +0000 (20:39 +0200)
commit052e79ac77d5928340a8b7146030ef12a6f60701
tree56f07e05a6e5693ebc8747fb173d5b46100dda2b
parent7728aa131769af4a73b6779e0d25220d23a0b3d9
parente3bf0049afe291472274900e438048ec809b13c4
Merge branch 'bug-1042' into testserver-stable
includes/notary.inc.php