]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 16 Jul 2016 21:03:01 +0000 (23:03 +0200)
committerNikita Popov <nikic@php.net>
Sat, 16 Jul 2016 21:03:01 +0000 (23:03 +0200)

Trivial merge