Merge branch 'bug-1389' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 22 Jul 2015 07:37:07 +0000 (09:37 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 22 Jul 2015 07:37:07 +0000 (09:37 +0200)
commit3d69a10d61d29b33a14db2bc6861d4129d7cdfda
treeed2882f82d00ff5ec876161d264009e69a75a83d
parent03cb079aba82af5f627f9c2de7b486aff3b1e26b
parent3bfd196d673ccdba2b60321da8a2666eb1d3b83d
Merge branch 'bug-1389' into testserver-stable
includes/mysql.php.sample