From: Remi Collet <remi@php.net>
Date: Thu, 2 May 2013 07:38:38 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0RC1~32^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d42ae3273807ba0ea7ae73f126aceed41c5e4a55;p=php

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
---

d42ae3273807ba0ea7ae73f126aceed41c5e4a55