Merge branch 'bug-413' into bug-1138 bug-1138
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 16:58:04 +0000 (18:58 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 16:58:04 +0000 (18:58 +0200)
commita4a8075571ad33ac0fd4393b25e0c1e8fc31d7fa
tree9af6cb6cd21d09fd902e18236a273829fecacfbf
parentcea6657d48bae2334bd37229df4e42a797b6c949
parent382f771389538a309193518a85357a02d9e323a9
Merge branch 'bug-413' into bug-1138

Conflicts:
pages/account/12.php
pages/account/5.php
pages/account/12.php
pages/account/5.php