Merge branch 'bug-1288' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 17:42:55 +0000 (18:42 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 17:42:55 +0000 (18:42 +0100)
1  2 
includes/general.php

Simple merge