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

This commit is contained in:
bors 2014-05-29 21:16:41 -07:00
commit d0b0f16c3f

1
.gitignore vendored
View File

@ -60,7 +60,6 @@ config.mk
/rt/
/rustllvm/
/test/
/build
/inst/
/mingw-build/
src/.DS_Store