Merge branch 'bug-1275' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 17:55:39 +0000 (19:55 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 17:55:39 +0000 (19:55 +0200)
1  2 
includes/account.php

Simple merge