Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."
This commit is contained in:
Stanislav Malyshev 2014-11-22 00:40:11 -08:00
commit bc55af0cf2

Diff content is not available