]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 11 Sep 2014 21:31:16 +0000 (23:31 +0200)
committerAnatol Belski <ab@php.net>
Thu, 11 Sep 2014 21:31:16 +0000 (23:31 +0200)
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0


Trivial merge