]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorChristopher Jones <sixd@php.net>
Fri, 30 Mar 2012 23:18:15 +0000 (16:18 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 30 Mar 2012 23:18:15 +0000 (16:18 -0700)
commit8b2a51c62c75b102ea5ec256a1b2918b00a3f6f6
tree23726dda96cff14b46de9cfce3b8ad1be9668faa
parent15405e2abdbc2e1dd487a5424ee16c1b40095e71
parentaa774a51d5c45b98103e0f67914d4c0b152e80ae
Merge branch 'PHP-5.4'

* PHP-5.4:
  Add php.ini parameter checks for OCI8