Merge branch 'bug-649' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 18:54:09 +0000 (20:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 18:54:09 +0000 (20:54 +0200)
commitf90f3ab79de4725b2143ea614312e4f7d636f53a
treeba096d0e627fb44b0f6d6b6e8011a9dedcf42286
parenta3d3111e9fd4def0103f3f2701f19a07991d7a1a
parent77bb1aa34b1b36e87869abaa53e2a60ec4296e11
Merge branch 'bug-649' into testserver-stable
includes/notary.inc.php