]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorFelipe Pena <felipensp@gmail.com>
Mon, 12 Oct 2015 12:07:49 +0000 (09:07 -0300)
committerFelipe Pena <felipensp@gmail.com>
Mon, 12 Oct 2015 12:07:49 +0000 (09:07 -0300)

Trivial merge