From: Stanislav Malyshev <stas@php.net>
Date: Wed, 4 Jun 2014 08:11:07 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~244^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d969932bf7ef20bf1481f04f0696e3514974c56;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)
---

3d969932bf7ef20bf1481f04f0696e3514974c56