Merge branch 'bug-893' into bug-1136
authorMichael Tänzer <neo@nhng.de>
Tue, 6 Aug 2013 21:09:32 +0000 (23:09 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 6 Aug 2013 21:56:07 +0000 (23:56 +0200)
Conflicts:
        includes/notary.inc.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
1  2 
includes/account.php
includes/notary.inc.php

Simple merge
Simple merge