From 8a46d689db21415f2a49798c5494abd77402e3f5 Mon Sep 17 00:00:00 2001
From: Manuel Kiessling <manuel@kiessling.net>
Date: Sat, 9 Jul 2011 21:10:57 +0200
Subject: [PATCH] cherry-picked 98e2cf097d8116c535c7: added node_modules/

Conflicts resolved:

	.gitignore
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 60677d0..b962c6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 .DS_Store
 *.swp
+node_modules/