]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:52:55 +0000 (18:52 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:54:48 +0000 (18:54 -0700)
commitc6384a7908976c5339374e7449e4ad5f38934e49
treeb9bff3b6810e76582640389395063956cef10796
parentfce9a856e73cfb6d9a4521d5b8ea2c15417f3145
parent1badfd8171119ef70a5d088068b9de88ba668f73
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
NEWS
UPGRADING
ext/curl/interface.c