Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 21 Jun 2016 07:28:17 +0000 (00:28 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 21 Jun 2016 07:28:17 +0000 (00:28 -0700)
commit7c389e842922b5a6a5030f46fb4e24dcd1dc4ae9
treece7ed8773821b35004011586976263da6991a331
parent8705254f2d4f73e22f150bc501fa534e7742754b
parent5b90a8bd7c5774f4f2cd0d1190886c760356dda9
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Now the right bug #
  Fix NEWS

Conflicts:
configure.in
main/php_version.h