From: Remi Collet <remi@php.net>
Date: Thu, 5 Jun 2014 11:46:41 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC1~1^2~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b3f4cc29eaca6205628424a0809f4d8497d7231;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
---

2b3f4cc29eaca6205628424a0809f4d8497d7231