Merge branch 'bug-964' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:02:09 +0000 (01:02 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:02:09 +0000 (01:02 +0100)
1  2 
includes/account.php

Simple merge