Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:22:08 +0000 (23:22 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 12 May 2015 21:22:08 +0000 (23:22 +0200)
commit68a407a7b937b34818190626010faafc5795bbf6
treeba12ac1878ab36be189912a17b5ad26e947643d3
parent8c8642a6de5533906270111d4592569b64cefc15
parentb9d8afd498aa01de66c84845edadd22d43934a14
Merge branch 'bug-1042' into testserver-stable
pages/account/43.php