]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/push/php-src
authorSTANLEY SUFFICOOL <ssufficool@php.net>
Thu, 23 Oct 2014 06:20:26 +0000 (23:20 -0700)
committerSTANLEY SUFFICOOL <ssufficool@php.net>
Thu, 23 Oct 2014 06:20:26 +0000 (23:20 -0700)
* 'master' of https://git.php.net/push/php-src:
  Implement Bug #66063 - pdo_dblib enable timeout parameter


Trivial merge