Merge branch 'release' into bug-440 bug-440
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:15:15 +0000 (01:15 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jan 2014 00:15:15 +0000 (01:15 +0100)
commite525adb1fcd467f68b9d6f3b685f6736ad8e7b09
tree8971ced37d9004453950c2a7ee1d8531ccba5a57
parent6238e3b56e965aeb8eaa3345af330e96714f3989
parentbc5cb72198019f4b27aa8e11b250c65cc8ca5717
Merge branch 'release' into bug-440

Conflicts:
includes/account.php

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