]> granicus.if.org Git - php/commitdiff
Merge branch 'gitignore' of https://github.com/flaupretre/php-src
authorXinchen Hui <laruence@php.net>
Wed, 17 Jun 2015 13:14:44 +0000 (21:14 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 17 Jun 2015 13:14:44 +0000 (21:14 +0800)

Trivial merge