Merge branch 'bug-1184' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:50:38 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Apr 2014 21:50:38 +0000 (23:50 +0200)
1  2 
includes/general.php

Simple merge