]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'master' of https://github.com/github/gitignore
authorGlaived <Glaived@gmail.com>
Mon, 1 Sep 2014 15:22:58 +0000 (17:22 +0200)
committerGlaived <Glaived@gmail.com>
Mon, 1 Sep 2014 15:22:58 +0000 (17:22 +0200)

Trivial merge