Merge branch 'bug-1394' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:28:04 +0000 (19:28 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:28:04 +0000 (19:28 +0200)
1  2 
includes/account.php

Simple merge