Merge branch 'bug-922' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:33:53 +0000 (18:33 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:33:53 +0000 (18:33 +0100)
commitfb0e466bf8805b6972af15f9d38f51a0f45e38de
tree745df46cf608d7eda3218c51b58efeaf135a8ce0
parente74bad9bcc62cbc3aea8bfc4aba8f656d7a80bcb
parent6dd2854e1d61800daa287f4f8139ade9c52a0a58
Merge branch 'bug-922' into release
includes/account.php