Merge branch 'bug-1355' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:20:06 +0000 (01:20 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:20:06 +0000 (01:20 +0100)
commit1fd8530e35a384fd7ec6430cd97004726e1f8298
tree1712b450e48fe9debe66501d7e6356f835216b90
parente2ad7792c3dd5c6b74a41f83882dd975306c8b37
parent8742c0193ab9ff0b56ec1d90d0a24a595534d982
Merge branch 'bug-1355' into testserver-stable

Conflicts:
includes/general.php
tverify/index.php
includes/account.php
includes/general.php
pages/account/43.php