From: Remi Collet <remi@php.net>
Date: Thu, 6 Mar 2014 10:02:40 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8121ca0e18154576fd1734556e7ee49f21695b7;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix order in NEWS
  Add CVE ref (not known at release time)
  Fix NEWS for 5.5.11 fix (really not in 5.5.10)
  5.5.10 release date for NEWS
---

a8121ca0e18154576fd1734556e7ee49f21695b7