Merge branch 'bug-1054' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:18:16 +0000 (00:18 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Apr 2015 22:18:16 +0000 (00:18 +0200)
commit0e4b9df2644939d69bd5818a40eff8ffc8f0f4fd
tree040413fe9d650dd8b017efcd448e2fb87b7707aa
parentcdca646992a618c9063c912af12997ef1d0695a5
parent9429f6bf21943069d6a577b64f5fa3bce45563c1
Merge branch 'bug-1054' into bug-1042
includes/general.php