From: Stanislav Malyshev <stas@php.net>
Date: Sat, 22 Nov 2014 08:41:06 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=515fa6160d22156f605a9bcb41db810ccad99097;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."
  Updated NEWS
---

515fa6160d22156f605a9bcb41db810ccad99097