]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/push/php-src
authorKalle Sommer Nielsen <kalle@php.net>
Thu, 25 Jun 2015 17:09:00 +0000 (19:09 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Thu, 25 Jun 2015 17:09:00 +0000 (19:09 +0200)

Trivial merge