Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Thu, 13 Sep 2012 01:14:33 +0000 (18:14 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 13 Sep 2012 01:14:33 +0000 (18:14 -0700)
commit33bea8471c8b7ce65d7890b27a31f153d17a090f
tree1632c05a79f85d006a0f4a00c4ca4fe7ed68e625
parentc36d92733151bfab4b741ddb09d572759732d857
parentb93675d60b3b751178ca01ab84785315ea2a693a
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix NEWS after releses
  Merge 5.3.16 NEWS in.