Merge branch 'bug-1354' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 14:20:43 +0000 (15:20 +0100)
committerBenny Baumann <BenBE@geshi.org>
Fri, 2 Jan 2015 14:20:43 +0000 (15:20 +0100)
1  2 
includes/general.php

Simple merge