From: Christopher Jones <sixd@php.net>
Date: Tue, 25 Jun 2013 19:00:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec7ac71b5246eedcae58571e7e284e975a9c5db5;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

ec7ac71b5246eedcae58571e7e284e975a9c5db5