Merge branch 'bug-1389' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:19:33 +0000 (19:19 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:19:33 +0000 (19:19 +0200)
commit3d8eec2fc1060e2307d8cd127e7f1ae331fc9c44
tree26e3bc63027b12ff9000191b673fb4e2bcb96aa4
parent48c5ae62272b7acdd9452267b82bae066dcb2052
parent2e6ca4e42dc724d7904ee05985c88ee800ee54a1
Merge branch 'bug-1389' into testserver-stable
includes/mysql.php.sample