]> granicus.if.org Git - php/commit
Merge branch 'pull-request/1192'
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:56:12 +0000 (18:56 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 01:56:12 +0000 (18:56 -0700)
commitad51c459f79a23fd0e34a91825edee83da137101
tree5043b0136f5bcd7b39052aba3bf0dd11fc032ba1
parentbe2e0b39bacbb98c423f32e4256ac557de24088e
parentc5f7a57eafd4d15bf8fcd7c207d3775ed77b0f61
Merge branch 'pull-request/1192'

* pull-request/1192:
  add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2