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)
commit03cb079aba82af5f627f9c2de7b486aff3b1e26b
treec9223945993a9743a2fe71f451ebe9ae72f7630f
parentde1eeb532805380bf7a747582c94fdfc62ce3401
parent3db97e4e1734de5e04b52ad5158e5aed0915ac4e
Merge branch 'bug-1379' into testserver-stable
includes/general_stuff.php
pages/account/6.php