Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:02:13 +0000 (22:02 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 2 Jun 2015 20:02:13 +0000 (22:02 +0200)
commit1881b5db7cb46fb437b1696c4821332c2eb911a8
treef3c759caa7d78171281a3f844dcd8e01f69cb0eb
parentf90f3ab79de4725b2143ea614312e4f7d636f53a
parent077e11d3463696add95127dcfd518e95d19187b4
Merge branch 'bug-1042' into testserver-stable
pages/account/43.php