Merge remote branch 'parndt/master'

antono · Nov 16, 2010 · acb5a18 · acb5a18
2 parents 64a0293 + 3533045
commit acb5a18
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,6 @@ plugins/repl/vendor/org-enclojure-repl-server.jar
 vendor/swtbot
 .server.yaml
 .yardoc
+
+Gemfile.lock
+.bundle