]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
authorKalle Sommer Nielsen <kalle@php.net>
Wed, 17 Aug 2016 18:27:46 +0000 (20:27 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Wed, 17 Aug 2016 18:27:46 +0000 (20:27 +0200)

Trivial merge