Merge branch 'bug-1054' into bug-1042
authorBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:15:17 +0000 (20:15 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 5 May 2015 18:15:17 +0000 (20:15 +0200)
1  2 
includes/general.php

Simple merge