Merge branch 'PHP-5.5' into PHP-5.6
authorRasmus Lerdorf <rasmus@php.net>
Fri, 17 Oct 2014 04:28:20 +0000 (21:28 -0700)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 17 Oct 2014 04:28:20 +0000 (21:28 -0700)
commit560646662433d503a47075f4c2f8ee6760bd93fd
treec4c102265ca1a97e848ba05c374d3297ff23082d
parent0d27b3ea698dbed6b1235f01d82984567aa2b569
parent2b5bffe6c70bc00ebe57390f48ef7569e401d2d3
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
ext/curl/interface.c