]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 15:38:13 +0000 (16:38 +0100)
committerNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 15:38:13 +0000 (16:38 +0100)

Trivial merge