Merge branch 'bug-981' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 9 Aug 2012 16:39:04 +0000 (18:39 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 9 Aug 2012 16:39:04 +0000 (18:39 +0200)
1  2 
includes/account.php

Simple merge