From: Anatol Belski <ab@php.net>
Date: Sat, 14 Mar 2015 17:30:32 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ac31872ac56cbeb3b8ef905c52b8f4dbf682311;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
---

2ac31872ac56cbeb3b8ef905c52b8f4dbf682311