Merge branch 'bug-1011' into release
authorMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:27:12 +0000 (00:27 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:27:12 +0000 (00:27 +0200)
1  2 
pages/account/40.php

Simple merge