From: Adam Roben <adam@roben.org>
Date: Fri, 28 Feb 2014 16:36:57 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c096a6566a8666e99aff5af76c941d21f21c243b;p=gitignore.git

Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch

Conflicts:
	Node.gitignore
---

c096a6566a8666e99aff5af76c941d21f21c243b