Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
authorMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:53:20 +0000 (00:53 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:53:20 +0000 (00:53 +0200)
Conflicts:
pages/account/10.php

Signed-off-by: Michael Tänzer <neo@nhng.de>

Trivial merge