From: Stanislav Malyshev <stas@php.net>
Date: Thu, 30 Jan 2014 07:48:19 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e79b54c4b5af6a125de9ca60f95b5fb29d204c5f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

e79b54c4b5af6a125de9ca60f95b5fb29d204c5f