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

Simple merge