Merge remote-tracking branch 'origin/bug-663' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 19:07:02 +0000 (21:07 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 19:07:02 +0000 (21:07 +0200)
1  2 
includes/account_stuff.php

Simple merge