Merge branch 'bug-1129' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 3 Feb 2015 20:40:24 +0000 (21:40 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 3 Feb 2015 20:40:24 +0000 (21:40 +0100)
1  2 
pages/account/43.php

Simple merge