Merge branch 'bug-1316' into bug-1050
authorFelix Dörre <felix@dogcraft.de>
Tue, 12 May 2015 20:45:01 +0000 (22:45 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 12 May 2015 20:45:01 +0000 (22:45 +0200)
commitb47e4b367e4ca0e86cbb314bd51ab82872c50f92
treecfbe6a63fc5708ea9367fd6e047c2a0f47616eb0
parent4fa1c66b3a2cb0228b855406dc189019b425b46f
parente2f72e63808feb0a2380d7e3fea85636b412427d
Merge branch 'bug-1316' into bug-1050
includes/notary.inc.php