Merge branch 'bug-1288' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 00:31:57 +0000 (01:31 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 00:31:57 +0000 (01:31 +0100)
commita31cb94286635f6055afc63b2dd22e3cf96f4d2f
treeb19ff7bcd3175b4c77d441ae34298762b13b203d
parent5ebf2d83021655df7e77f870658d8adaddab5330
parentfc29c30e5fc0110fcca39758dcb9b212c049c035
Merge branch 'bug-1288' into testserver-stable
includes/general.php