]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorChristopher Jones <sixd@php.net>
Fri, 19 Oct 2012 00:58:36 +0000 (17:58 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 19 Oct 2012 00:58:36 +0000 (17:58 -0700)
* PHP-5.4:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)


Trivial merge