]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAdam Baratz <adambaratz@php.net>
Tue, 13 Sep 2016 20:19:25 +0000 (16:19 -0400)
committerAdam Baratz <adambaratz@php.net>
Tue, 13 Sep 2016 20:19:25 +0000 (16:19 -0400)
* PHP-7.1:
  Allow \PDO::setAttribute() to set pdo_dblib query timeouts


Trivial merge