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

Merge branch 'PHP-5.5'

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

f54a87e3abae531bde5b2b27a63dbc66f77e4fb2