]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 14:21:38 +0000 (15:21 +0100)
committerNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 14:21:38 +0000 (15:21 +0100)

Trivial merge