]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorCôme Bernigaud <mcmic@php.net>
Wed, 17 Jun 2015 12:48:19 +0000 (14:48 +0200)
committerCôme Bernigaud <mcmic@php.net>
Wed, 17 Jun 2015 13:08:47 +0000 (15:08 +0200)
commit78fe52475f8dc9b2e8551b478010c46a9822c5a9
tree66aa79c4980a7796fe8b6f26cdd64e1baa20db01
parenta5629f8845031a2e5f56a56aee3cf850939e92c0
parente7af0fe1eb89e40671e86a588aa1b78607b85461
Merge branch 'PHP-5.6'

* PHP-5.6:
  Replaced calls to deprecated openldap functions
  Fixed LDAP tests so that base can exists

Conflicts:
ext/ldap/ldap.c
ext/ldap/ldap.c