From: Michael Wallner <mike@php.net>
Date: Wed, 9 Oct 2013 06:16:23 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~211^2~30^2~5^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfa4eced9f7407f924fdf9c4bdbceae5373b3d0e;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  consolidate NEWS with 5.4
---

cfa4eced9f7407f924fdf9c4bdbceae5373b3d0e