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

Trivial merge