]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Mon, 5 Sep 2016 12:22:29 +0000 (14:22 +0200)
committerNikita Popov <nikic@php.net>
Mon, 5 Sep 2016 12:22:29 +0000 (14:22 +0200)
[ci skip]


Trivial merge