Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137
authorMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:53:20 +0000 (00:53 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:53:20 +0000 (00:53 +0200)
commit4a3ba3b7c9525501bcbf71ad0ad048f5a99018b4
treee7dfd2b1fbeecbcd129dc008ef352a966843d956
parentc34d0d386d2efb408cdc2dbd512a67ca259abea3
parentb3f92f6473bc302bddb5efe7f3b6e200625cfacb
Merge branch 'bug-1123' into merge-bug-1177-893-1136-1123-1137

Conflicts:
pages/account/10.php

Signed-off-by: Michael Tänzer <neo@nhng.de>