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

Simple merge