From: Côme Bernigaud Date: Tue, 30 Jun 2015 07:31:19 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: php-7.1.0alpha3~25^2~95 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d554d64f649a915b4ecb3a1de409cfc8ff0e9133;p=php Merge branch 'PHP-5.6' * PHP-5.6: keep LDAP_DEPRECATED in config.w32 --- d554d64f649a915b4ecb3a1de409cfc8ff0e9133