From: Stanislav Malyshev <stas@php.net>
Date: Tue, 1 Sep 2015 19:24:14 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.14RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fe509443ccaebd5626f18490f36f088cde16d3f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix unit tests
---

3fe509443ccaebd5626f18490f36f088cde16d3f