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

Simple merge