auto merge of #4535 : servo/servo/pre-rustup_20141221, r=jdm

This prepares for the rust upgrade currently being conducted.
This commit is contained in:
bors-servo 2015-01-03 14:39:46 -07:00
commit e8fac3681b
35 changed files with 63 additions and 66 deletions

@ -1 +1 @@
Subproject commit b8c8f84262de6d412befabee4f62dbf8d4fe50be
Subproject commit 41ecbd6f0fbec92c4b2ac312e853fccdbe63d89b