]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Fri, 22 Jul 2016 15:22:13 +0000 (17:22 +0200)
committerNikita Popov <nikic@php.net>
Fri, 22 Jul 2016 15:22:13 +0000 (17:22 +0200)

Trivial merge