Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 18:03:58 +0000 (19:03 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 18:03:58 +0000 (19:03 +0100)
commit9244bbfbd96e78a71dac48b90e91380e79914082
treec1e27bf7a0c1fc3d89e10ec18d888a69d5de0547
parentfd40b4032e0b9181ae2cec871bcae4dcfb88c9fb
parentb388a866c926be68aeb5a9e5bb28b364fa39ad86
Merge branch 'bug-1318' into testserver-stable
includes/general.php