Merge branch 'bug-1138' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 20:58:42 +0000 (22:58 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 20:58:42 +0000 (22:58 +0200)
commit4dd6c64ef0556151b0bfa5f2b452d810e44ab3ac
tree08585b83f9efdc302ca7c725b29f50dba7ff2ae6
parent76b8145a2f68d2f65384e2e51530b207b1a737ea
parenta4a8075571ad33ac0fd4393b25e0c1e8fc31d7fa
Merge branch 'bug-1138' into release
includes/account.php