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)
commitf84d7c2ca78529eedcb93bb55638514205747198
treeb7dc4d271eb97ba0db3df2a4844d0e2db5cdb5fd
parentcf386f0fc750fb2d00303f88ee991e44b6ca910c
parenta0274662cf30a102b53a6d0ae63ccec01a6b19a1
Merge branch 'bug-1389' into testserver-stable
includes/mysql.php.sample