]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Thu, 2 May 2013 07:38:38 +0000 (09:38 +0200)
committerRemi Collet <remi@php.net>
Thu, 2 May 2013 07:38:38 +0000 (09:38 +0200)
commitd42ae3273807ba0ea7ae73f126aceed41c5e4a55
treede57e9e73f7c0f8cc95d5e7013816a4ea342d448
parente3aeb6c0707cbe3a42bd4d45a80128dc8cc5be28
parentbe3f7ba4fbe2e4f9dec1da610facaef2dcbb10b3
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67