]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:59:55 +0000 (19:59 +0100)
committerAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:59:55 +0000 (19:59 +0100)
commit464667153d7ca35ac9ffecdc4891f8a9469aebcb
tree1571abf76fdd62eb038827ede774a05c77a4d6b8
parente6d16c095625c577be8091a7f368d0465c2b4644
parent9bf95d82911dc7028c624494e9ac914f615f66ed
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix setting default ODBCVER value in config.w32