]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Tue, 4 Jun 2013 05:03:25 +0000 (22:03 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Jun 2013 05:03:25 +0000 (22:03 -0700)
commitb144c263191f857391d3cc009951c95d25a2cdb3
tree504087dc6f94b31e32cab39b09e65a45d428ae8c
parent57dd91be827364eba4d185a20ff3b95d25031543
parent74e52eaea9c9d030dd70cf915b6f506065741dca
Merge branch 'PHP-5.5'

* PHP-5.5:
  news for dblib fixes
  FIX BUG #55647, #60512, #60512, #61900, #64338, #64808, #63638
  Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
ext/pdo_dblib/dblib_driver.c
ext/pdo_dblib/dblib_stmt.c