]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorKalle Sommer Nielsen <kalle@php.net>
Wed, 3 Aug 2016 14:42:01 +0000 (16:42 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Wed, 3 Aug 2016 14:42:01 +0000 (16:42 +0200)

Trivial merge