]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Tue, 30 Aug 2016 11:44:59 +0000 (13:44 +0200)
committerNikita Popov <nikic@php.net>
Tue, 30 Aug 2016 11:44:59 +0000 (13:44 +0200)

Trivial merge