From: Michael Wallner <mike@php.net>
Date: Thu, 12 Dec 2013 11:10:08 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0e87e9bb170ba1c249c629bc752a2230e5efb80;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix test
---

c0e87e9bb170ba1c249c629bc752a2230e5efb80