auto merge of #14512 : Heather/rust/patch-1, r=alexcrichton

bors · bors · commit d0b0f16c3f28 · 2014-05-29T21:16:41.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -60,7 +60,6 @@ config.mk
 /rt/
 /rustllvm/
 /test/
-/build
 /inst/
 /mingw-build/
 src/.DS_Store
