Merge branch 'bug-966' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:31:19 +0000 (01:31 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:31:19 +0000 (01:31 +0100)
commitd933011668c5731b82c23a2ae8272a9488f5640c
tree3e36200a325501ce26fb1ef93a195cf6e6621937
parent4942782d3a52b8a067a63af5767425f6f022f83e
parentfba0e788405dc3aa4a27bdad228d3568e8faf214
Merge branch 'bug-966' into release
includes/account.php