Merge branch 'release' into bug-440
authorMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 02:18:30 +0000 (03:18 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 02:18:30 +0000 (03:18 +0100)
Conflicts:
includes/account.php

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

Simple merge