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

Merge branch 'PHP-5.4' into PHP-5.5

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

ab848ea400d4a3536aeb0b281b51abc239264595