Merge branch 'release' into bug-807
authorBenny Baumann <BenBE@geshi.org>
Fri, 13 Jun 2014 07:19:57 +0000 (09:19 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 13 Jun 2014 07:19:57 +0000 (09:19 +0200)
commitf25f8af03c96cfcd4dd83a9f3b6ee4181eb3e2c9
tree7162d1c77760fad5c53474d9bf0a0c7e122b2f66
parent57ba86ff84eb3dcc15f8122b29efeae54434652e
parent2affa9c6e9a1f2a7f68ab5fa306374cd037d6227
Merge branch 'release' into bug-807

Conflicts:
includes/account.php
includes/lib/account.php
pages/account/16.php
includes/account.php
includes/lib/account.php
pages/account/16.php
www/styles/default.css