From: Christopher Jones <sixd@php.net>
Date: Fri, 19 Oct 2012 00:57:19 +0000 (-0700)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~21^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85b0eda4c832fc6ffde0595764b2cee1d741cf41;p=php

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)
---

85b0eda4c832fc6ffde0595764b2cee1d741cf41