]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Tue, 29 Mar 2016 17:29:55 +0000 (19:29 +0200)
committerNikita Popov <nikic@php.net>
Tue, 29 Mar 2016 17:29:55 +0000 (19:29 +0200)

Trivial merge