Merge branch 'bug-1308' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 21:20:43 +0000 (23:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 21:20:43 +0000 (23:20 +0200)
1  2 
includes/general.php

Simple merge