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

Merge branch 'PHP-5.6'

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

aafbf938412291507ecd340a0346601bdfc7a48c