From: Stanislav Malyshev <stas@php.net>
Date: Wed, 2 Mar 2016 06:55:49 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6.19
X-Git-Tag: php-5.6.19~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e6a556b8c8e192ab44edeaabe012f29b614202d;p=php

Merge branch 'PHP-5.5' into PHP-5.6.19

* PHP-5.5:
  fix test file
  Fix version
  Update NEWS
---

6e6a556b8c8e192ab44edeaabe012f29b614202d