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)
commit0a982f8ba01b5b47230d7a16aaa624bb9e340207
treeb1e23a43702c453e15a7284c0b9d40a02b16b4b0
parent3cbac6cc51939d04ee6adadcaf07d5b27947d5dc
parent945f334cc612b6f853d926163815f71242ea342a
Merge branch 'bug-893' into bug-1136

Conflicts:
        includes/notary.inc.php

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