Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 15:09:11 +0000 (16:09 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 3 Jan 2015 15:09:11 +0000 (16:09 +0100)
commit8e38a22d467d56a29d20ad0b75c4442cd9268134
tree1d3313a74c02563d498dcab437cb17f64502a2f3
parentfe18b916965427af18bc80f6f02886257f1599bf
parent468c97305b684f7cd0aa09449f18a424cb7f7fd7
Merge branch 'bug-1354' into testserver-stable
includes/general.php