]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:41:40 +0000 (00:41 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 22 Nov 2014 08:41:40 +0000 (00:41 -0800)
commit134827dbd56d625de575760bc79db6c006946863
tree50fb33f6b8fd89c7c0a6de97b29f07ea2fad593d
parentd2aeef63abc1135ee6a36f8d24e3ca16d8e61f00
parent515fa6160d22156f605a9bcb41db810ccad99097
Merge branch 'PHP-5.6'

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