]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorKalle Sommer Nielsen <kalle@php.net>
Sun, 3 Apr 2016 23:31:59 +0000 (01:31 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Sun, 3 Apr 2016 23:31:59 +0000 (01:31 +0200)

Trivial merge