Merge pull request #2331 from cptaffe/master

Rails gitignore misuses double-asterisk

Author: shiftkey

Rails.gitignore

@@ -8,7 +8,7 @@ capybara-*.html
 /public/system
 /coverage/
 /spec/tmp
-**.orig
+*.orig
 rerun.txt
 pickle-email-*.html