]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorCôme Bernigaud <mcmic@php.net>
Mon, 6 Jul 2015 12:56:20 +0000 (14:56 +0200)
committerCôme Bernigaud <mcmic@php.net>
Mon, 6 Jul 2015 12:56:20 +0000 (14:56 +0200)
* PHP-5.6:
  Attempt at falling back on ldap_find_control for Mac OS

1  2 
ext/ldap/ldap.c

diff --cc ext/ldap/ldap.c
Simple merge