From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 1 May 2014 08:56:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta2~1^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3da5ef47ca341584fee2768cbbe5d66be6456758;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added
---

3da5ef47ca341584fee2768cbbe5d66be6456758