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

Trivial merge