Merge branch 'bug-1008' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 20:04:47 +0000 (22:04 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 20:04:47 +0000 (22:04 +0200)
1  2 
pages/account/43.php

Simple merge