Merge branch 'bug-1339' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:37:24 +0000 (19:37 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:37:24 +0000 (19:37 +0100)
commitf535d495a1d1cf230770abaca301375ac7f46e49
tree7423e0daa0254acd9d4ef2ae1fa9642f5bc06388
parentcd8a00093b9aaa4de29c8e06796d5dcf56401bc8
parent3e578bf67cf3ba551aecae52b2f95d910af336ec
Merge branch 'bug-1339' into testserver-stable
includes/account.php
pages/account/13.php
www/index.php