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)
1  2 
includes/general.php

Simple merge