Merge branch 'bug-1379' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Jun 2015 20:40:52 +0000 (22:40 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Jun 2015 20:40:52 +0000 (22:40 +0200)
1  2 
includes/general_stuff.php
pages/account/6.php

Simple merge
Simple merge