Merge branch 'bug-1070' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 1 Apr 2014 08:27:58 +0000 (10:27 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 1 Apr 2014 08:27:58 +0000 (10:27 +0200)
1  2 
includes/general.php

Simple merge