From: Stanislav Malyshev <stas@php.net>
Date: Tue, 2 Feb 2016 03:15:19 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6.18
X-Git-Tag: php-7.0.3~8^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24167095a5fbc4ba6cd14ce5aa85ba000d9d4980;p=php

Merge branch 'PHP-5.5' into PHP-5.6.18

* PHP-5.5:
  fix tests
  fix NEWS
  update NEWS
---

24167095a5fbc4ba6cd14ce5aa85ba000d9d4980