]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/push/php-src
authorKalle Sommer Nielsen <kalle@php.net>
Fri, 26 Jun 2015 08:24:45 +0000 (10:24 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Fri, 26 Jun 2015 08:24:45 +0000 (10:24 +0200)

Trivial merge