Merge branch 'bug-789' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:43 +0000 (02:28 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:43 +0000 (02:28 +0200)
1  2 
includes/account.php
pages/account/30.php

Simple merge
Simple merge