]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Fri, 4 Oct 2013 22:51:39 +0000 (15:51 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 4 Oct 2013 22:51:39 +0000 (15:51 -0700)
* PHP-5.5:
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.


Trivial merge