]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Thu, 2 May 2013 07:39:06 +0000 (09:39 +0200)
committerRemi Collet <remi@php.net>
Thu, 2 May 2013 07:39:06 +0000 (09:39 +0200)
* PHP-5.5:
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67


Trivial merge