Merge branch 'PHP-7.0'
authorStanislav Malyshev <stas@php.net>
Mon, 15 Feb 2016 09:53:24 +0000 (01:53 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 15 Feb 2016 09:53:24 +0000 (01:53 -0800)
commitc3e0ef6b635ed3315467267751c18307a80f7cbc
tree3870d030e40fecc4346eb460a2e1f0caea39ab6a
parentb3c2a47231d5f0a18adbc864bf5c688672c967b5
parentc1355152dbdf131ebda1a21e7c66913b4ed9037c
Merge branch 'PHP-7.0'

* PHP-7.0:
  More fixing for bug #71540