Merge remote-tracking branch 'upstream/master'

pangratz · pangratz · commit 94f45ecd5cf5 · 2011-12-12T14:02:39.000+01:00
diff --git a/Rails.gitignore b/Rails.gitignore
@@ -12,6 +12,5 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
-config/*.yml
 rerun.txt
 pickle-email-*.html
