From: Christopher Jones <sixd@php.net>
Date: Tue, 25 Jun 2013 19:00:56 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.6.0alpha1~394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53ec0650770114b69e2d23dfd53adb93b72e5f9a;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
---

53ec0650770114b69e2d23dfd53adb93b72e5f9a