From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 17:20:51 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ffcb48184a454fbe491e650fd177e07d713b2d6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
---

7ffcb48184a454fbe491e650fd177e07d713b2d6