]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 23 Feb 2016 13:22:06 +0000 (14:22 +0100)
committerAnatol Belski <ab@php.net>
Tue, 23 Feb 2016 13:22:06 +0000 (14:22 +0100)
* PHP-5.6:
  make ext/odbc test credentials configurable


Trivial merge