Merge remote-tracking branch 'upstream/master'

This commit is contained in:
pangratz 2011-12-12 14:02:39 +01:00
commit 94f45ecd5c

View File

@ -12,6 +12,5 @@ capybara-*.html
/coverage/ /coverage/
/spec/tmp/* /spec/tmp/*
**.orig **.orig
config/*.yml
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html