]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Fri, 3 Jul 2015 11:32:05 +0000 (13:32 +0200)
committerChristoph M. Becker <cmb@php.net>
Fri, 3 Jul 2015 11:32:05 +0000 (13:32 +0200)
* PHP-5.6:
  fixed fix #69975 wrt. ODBCVER < 0x0300

1  2 
ext/odbc/php_odbc.c

Simple merge