Merge branch 'bug-1288' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:44:25 +0000 (14:44 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 13:44:25 +0000 (14:44 +0100)
1  2 
includes/general.php

Simple merge