]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorKalle Sommer Nielsen <kalle@php.net>
Mon, 19 Oct 2015 14:56:23 +0000 (16:56 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Mon, 19 Oct 2015 14:56:23 +0000 (16:56 +0200)

Trivial merge