Merge branch 'bug-1339' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:37:24 +0000 (19:37 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:37:24 +0000 (19:37 +0100)
1  2 
includes/account.php
pages/account/13.php
www/index.php

Simple merge
Simple merge
diff --cc www/index.php
Simple merge