From: Remi Collet <remi@php.net>
Date: Tue, 3 Jun 2014 09:28:43 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~251^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e16493e721278d1c4c0affc3d3e6cbc7bbd2596;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29
---

9e16493e721278d1c4c0affc3d3e6cbc7bbd2596