Merge branch 'bug-569' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Oct 2013 15:36:55 +0000 (17:36 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Oct 2013 15:36:55 +0000 (17:36 +0200)
1  2 
includes/account.php

Simple merge