]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorSara Golemon <pollita@php.net>
Thu, 21 Feb 2013 11:21:49 +0000 (03:21 -0800)
committerSara Golemon <pollita@php.net>
Thu, 21 Feb 2013 11:21:49 +0000 (03:21 -0800)
* PHP-5.3:
  http-stream test requires network connectivity


Trivial merge