]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of http://git.php.net/repository/php-src
authorChristoph M. Becker <cmb@php.net>
Mon, 20 Jun 2016 13:43:33 +0000 (15:43 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 20 Jun 2016 13:43:33 +0000 (15:43 +0200)

Trivial merge