Merge branch 'bug-1042' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 16:32:47 +0000 (18:32 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sat, 6 Jun 2015 16:32:47 +0000 (18:32 +0200)
1  2 
includes/lib/general.php

Simple merge