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

Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed test
---

e5b8fd2cc73b9e2c2f6f99f72bc225564b15b935