Merge branch 'bug-790' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 7 Oct 2014 21:15:44 +0000 (23:15 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 7 Oct 2014 21:15:44 +0000 (23:15 +0200)
commit85c46974167b86a04a4bffd5437d3d313539d6bb
tree1835c6ccd86e894aea634697b88429d989523846
parentd1f414b231573e9154fd399556f46cf80bb4bfce
parent7c3691bce3bfbd46e8e18bd23f0aa566f685c5fe
Merge branch 'bug-790' into testserver-stable
includes/account.php