Merge branch 'bug-1186' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:18:02 +0000 (21:18 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:18:02 +0000 (21:18 +0200)
commit027be44fc997873f0741b78d0d1794935db1f3b7
tree8d439e48ee4d4c8b9acb208f47ddeb6c7fbd337a
parent12ab18c8898d3bd5a62b0aab34842b8463dd9c98
parent4774e98ecc1f9499c688284e8c51c70a6985208e
Merge branch 'bug-1186' into release
includes/general.php