]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorChristopher Jones <sixd@php.net>
Fri, 30 Mar 2012 23:17:37 +0000 (16:17 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 30 Mar 2012 23:17:37 +0000 (16:17 -0700)
* PHP-5.3:
  Add php.ini parameter checks for OCI8


Trivial merge