Merge branch 'master' into newpages

Conflicts: .gitignore
Automattic · Jul 19, 2012 · 67b970a · 67b970a
2 parents 543650c + d64abe3
commit 67b970a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,9 @@
 lib-cov
 node_modules/
-*.swp
-*.swo
+*.sw*
+*.orig
+benchmarks/benchmarks
+benchmarks/benchmarks2
+benchmarks/benchmarks3
+benchmarks/v8.log
 .DS_Store