Merge branch 'bug-1392' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:50:05 +0000 (23:50 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 26 Jul 2015 21:50:05 +0000 (23:50 +0200)
1  2 
includes/general.php

Simple merge