]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Sun, 3 Mar 2013 21:20:57 +0000 (13:20 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 3 Mar 2013 21:20:57 +0000 (13:20 -0800)
* PHP-5.3:
  rename NEWS back
  updated NEWS

1  2 
NEWS

diff --cc NEWS
Simple merge