]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch
authorAdam Roben <adam@roben.org>
Fri, 28 Feb 2014 16:36:57 +0000 (11:36 -0500)
committerAdam Roben <adam@roben.org>
Fri, 28 Feb 2014 16:36:57 +0000 (11:36 -0500)
Conflicts:
Node.gitignore


Trivial merge