Merge branch 'master' into phase2_tests

maxdemarzi · Oct 1, 2012 · 440b4bc · 440b4bc
2 parents b81c8aa + 1ebac4a
commit 440b4bc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ pkg/*
 .bundle
 log/*
 .rvmrc
+Gemfile.lock