Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 12:56:25 +0000 (13:56 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 12:56:25 +0000 (13:56 +0100)
commit055903f98e575d31da9e2189d0a83724c9f11322
tree501337a17be6860fddec0adcfdb9582706113479
parentdd9d8f84843eef8c5e5d744c91116a0d532f655a
parentb9e5bc9e1fbcb4ec8be3b361894ab8715e42d630
Merge branch 'bug-1318' into testserver-stable
includes/general.php