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)
1  2 
pages/account/43.php

Simple merge