Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 14:11:26 +0000 (15:11 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 14:11:26 +0000 (15:11 +0100)
commit5ebf2d83021655df7e77f870658d8adaddab5330
treefd2ab91401a5d684b5693688229e7fb1519df231
parentbdf526bffe8c3bc441b9d3b8c02e3e209457321a
parent5ea53c50ad1679e808bd0ddd4da92ed88b499a7d
Merge branch 'bug-1318' into testserver-stable
includes/general.php