]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/push/php-src
authorKalle Sommer Nielsen <kalle@php.net>
Tue, 19 May 2015 10:13:19 +0000 (12:13 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Tue, 19 May 2015 10:13:19 +0000 (12:13 +0200)

Trivial merge