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)
commitb4e46cf744412cc06e5abd83d0d01e27971e8d0e
tree71ba1037117b98ee33c2cc300c0aa67c816d4f90
parent9fe4952e31fb3025f05d5742be4493bacfbf5826
parent9875ded5c2aff462cbb672f2384598ca1f07b2af
Merge branch 'bug-789' into release
includes/account.php
pages/account/30.php