From: Christopher Jones <sixd@php.net>
Date: Fri, 16 Aug 2013 18:13:55 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7237c317d6bb896372fcaa7ace1cd521994b9442;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS
---

7237c317d6bb896372fcaa7ace1cd521994b9442