From: Stanislav Malyshev <stas@php.net>
Date: Sat, 22 Nov 2014 08:40:11 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.20RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc55af0cf22aa419376b52fbd3f4c7310ab07d77;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."
---

bc55af0cf22aa419376b52fbd3f4c7310ab07d77