Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:41:06 +0000 (00:41 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:41:06 +0000 (00:41 -0800)
commit515fa6160d22156f605a9bcb41db810ccad99097
tree3f79ecb1c57038cbe28c642e49aba60e7b4126ad
parent9a06628c8025d14ef4caaf0bac3a659289dea7df
parentbc55af0cf22aa419376b52fbd3f4c7310ab07d77
Merge branch 'PHP-5.5' into PHP-5.6

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