From: Sara Golemon <pollita@php.net>
Date: Thu, 21 Feb 2013 11:22:09 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ead2e1708d3781a71a460f44e326becfd8b5e360;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

ead2e1708d3781a71a460f44e326becfd8b5e360