From: Remi Collet <remi@php.net>
Date: Thu, 5 Jun 2014 12:00:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~242^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=218df7e058b89f43481a4e5b2f180ca5fbeeb5fe;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add test for previous fix
---

218df7e058b89f43481a4e5b2f180ca5fbeeb5fe