]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 19:00:26 +0000 (20:00 +0100)
committerAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 19:00:26 +0000 (20:00 +0100)
commit47af2381ebc487949f30888c6673b40511d1b2b3
tree5a0634f433ef24c4bacf3cfab0de3804034084bb
parent0f9b686eb2e6b27158bf4bb7384fb006a924cfbd
parent464667153d7ca35ac9ffecdc4891f8a9469aebcb
Merge branch 'PHP-5.6'

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