Merge rustc (1.21.0+dfsg1-3) import into refs/heads/workingbranch
authorXimin Luo <infinity0@debian.org>
Mon, 6 Nov 2017 09:03:32 +0000 (09:03 +0000)
committerXimin Luo <infinity0@debian.org>
Mon, 6 Nov 2017 09:03:32 +0000 (09:03 +0000)

Trivial merge