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)
1  2 
includes/account.php

Simple merge