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

Simple merge