Merge branch 'bug-790' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:47:04 +0000 (23:47 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Sep 2014 21:47:04 +0000 (23:47 +0200)
1  2 
pages/account/19.php

Simple merge