]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 18 Apr 2012 10:48:36 +0000 (18:48 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 18 Apr 2012 10:48:36 +0000 (18:48 +0800)
* PHP-5.4:
  Fix NEWS, the previous wrong was introduced in commit cb2a1c71c96d7c9b2ee03d77beae0c8e0d385f1b
  update NEWS


Trivial merge