From: Anatoliy Belsky <ab@php.net>
Date: Wed, 5 Dec 2012 08:58:04 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~43^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d7ff76659ddb679108f3cc6016a825c93a6605d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Two tests deactivated until #63688 was fixed
---

7d7ff76659ddb679108f3cc6016a825c93a6605d