]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorCôme Bernigaud <mcmic@php.net>
Tue, 30 Jun 2015 07:31:19 +0000 (09:31 +0200)
committerCôme Bernigaud <mcmic@php.net>
Tue, 30 Jun 2015 07:31:19 +0000 (09:31 +0200)
* PHP-5.6:
  keep LDAP_DEPRECATED in config.w32


Trivial merge