]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 17 Apr 2015 15:13:45 +0000 (17:13 +0200)
committerAnatol Belski <ab@php.net>
Fri, 17 Apr 2015 15:13:45 +0000 (17:13 +0200)
commit042fa25896a4ff04bf004d6f21c84a3aa30a4e91
tree38385d24e24bf3242f6f91c6fe99273b17182392
parent342acbe1c6f1c01ef994cd1084165967fc6618a7
parente09febb286b08a0a7bdbd8a63435eac8963906c4
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix column name attribute with ODBC 3.0
  migrate SQLAllocStmt for ODBC 3.0 compliance