]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorSara Golemon <pollita@php.net>
Thu, 21 Feb 2013 11:22:09 +0000 (03:22 -0800)
committerSara Golemon <pollita@php.net>
Thu, 21 Feb 2013 11:22:09 +0000 (03:22 -0800)
commitead2e1708d3781a71a460f44e326becfd8b5e360
tree0bf5d8f34afb39869122e764b7486e9b3fe350ba
parentf39d12c8210df2bc6dd0ead5d6bc63df63eea45f
parentc16d6befd429a2e55c266b6e8df7fe2f93f68c91
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  http-stream test requires network connectivity