From: Anatol Belski <ab@php.net>
Date: Fri, 21 Nov 2014 12:57:46 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64b9277867cb0da1a68a122b0a9fe6dfb78d9c84;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test
---

64b9277867cb0da1a68a122b0a9fe6dfb78d9c84