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)
commit76b8145a2f68d2f65384e2e51530b207b1a737ea
treead8987303f68489d52018949cd21ddff0a2e90ba
parent95af242992dd8250c14518cb067ae2b094e2cb8a
parent9af483343fd8eac522d67e8cfc8130ac1ce6c07b
Merge branch 'bug-1275' into release
includes/account.php