]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Thu, 12 Feb 2015 19:30:48 +0000 (20:30 +0100)
committerAnatol Belski <ab@php.net>
Thu, 12 Feb 2015 19:30:48 +0000 (20:30 +0100)

Trivial merge