From: Xinchen Hui <laruence@php.net>
Date: Wed, 18 Apr 2012 10:48:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~292^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=140c8c197593884a1746d8c1c59a71f9b4859943;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
  update NEWS
---

140c8c197593884a1746d8c1c59a71f9b4859943