Merge branch 'bug-1019' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 13 Sep 2012 16:50:31 +0000 (18:50 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 13 Sep 2012 16:50:31 +0000 (18:50 +0200)
1  2 
pages/account/40.php

Simple merge