]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 5 Dec 2015 21:48:50 +0000 (22:48 +0100)
committerNikita Popov <nikic@php.net>
Sat, 5 Dec 2015 21:48:50 +0000 (22:48 +0100)

Trivial merge