]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 8 Oct 2015 09:04:45 +0000 (11:04 +0200)
committerNikita Popov <nikic@php.net>
Thu, 8 Oct 2015 09:04:45 +0000 (11:04 +0200)

Trivial merge