]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 19:00:56 +0000 (12:00 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 25 Jun 2013 19:00:56 +0000 (12:00 -0700)
* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)


Trivial merge