]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorChristopher Jones <sixd@php.net>
Fri, 19 Oct 2012 00:57:19 +0000 (17:57 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 19 Oct 2012 00:57:19 +0000 (17:57 -0700)
commit85b0eda4c832fc6ffde0595764b2cee1d741cf41
tree1793e0b76e39f893f45379e234244d97d6d53629
parent8bfc00287165b45e8f9759b6914261340161fa34
parentaf14da5714cbcd9c12f140bbb622f10aa0b227a8
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)