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

Simple merge