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)
1  2 
includes/notary.inc.php

Simple merge