Merge branch 'bug-1129' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:13:53 +0000 (01:13 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:13:53 +0000 (01:13 +0100)
Conflicts:
pages/account/13.php

1  2 
pages/account/43.php

Simple merge