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

Merge branch 'PHP-5.4' into PHP-5.5

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

9ea9064779a0de96079755694688a136487ba160