Merge branch 'tidy-hook' of github.com:todb-r7/metasploit-framework into todb-r7-tidy-hook

sinn3r · sinn3r · commit cd10de3cd809 · 2013-01-04T00:48:33.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ tags
 *.swp
 *.orig
 *.rej
+*~

-Original file line number
+Diff line change
 *.swp
 *.orig
 *.rej
 +*~