]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  http-stream test requires network connectivity


Trivial merge