Merge branch 'release' into bug-1138
authorMichael Tänzer <neo@nhng.de>
Mon, 24 Mar 2014 14:03:15 +0000 (15:03 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 24 Mar 2014 14:03:15 +0000 (15:03 +0100)
1  2 
includes/account.php

Simple merge