From: Anatol Belski <ab@php.net>
Date: Fri, 25 Apr 2014 15:40:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~340^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70fdb21d9354f34050c30842a313eddae766a580;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test
---

70fdb21d9354f34050c30842a313eddae766a580