Merge branch 'bug-1393' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 20:20:53 +0000 (22:20 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 20:20:53 +0000 (22:20 +0200)
1  2 
includes/general.php

Simple merge