Merge branch 'bug-1301' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Fri, 29 Aug 2014 22:54:28 +0000 (00:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 29 Aug 2014 22:54:28 +0000 (00:54 +0200)
1  2 
includes/general.php

Simple merge