Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:50:44 +0000 (14:50 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:50:44 +0000 (14:50 +0100)
commit21315daeea94a80359698bb5143bab927ba7eaee
tree8e08506370c63f212bcbec12f2292fb78251bad3
parent34c3a6380c0e70b4648777b8b51e3a35117762df
parent2ccdbb3af3cbac35195edd4fe65e946a0c27f70b
Merge branch 'bug-1318' into testserver-stable
includes/general.php