From: Stanislav Malyshev <stas@php.net>
Date: Thu, 30 Jan 2014 07:48:34 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha2~1^2~29^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1207461d143719923825399533a4b002aa1d5425;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
---

1207461d143719923825399533a4b002aa1d5425