From: Stanislav Malyshev <stas@php.net>
Date: Sun, 15 Jun 2014 08:06:46 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2b3ce717f2970889019f6dc3591db18cbf3f954;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
---

b2b3ce717f2970889019f6dc3591db18cbf3f954