Merge branch 'bug-966' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:31:19 +0000 (01:31 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:31:19 +0000 (01:31 +0100)
1  2 
includes/account.php

Simple merge