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

Trivial merge