]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 1 Oct 2015 18:47:29 +0000 (20:47 +0200)
committerNikita Popov <nikic@php.net>
Thu, 1 Oct 2015 18:47:29 +0000 (20:47 +0200)

Trivial merge