Merge rustc (1.25.0+dfsg1-2) import into refs/heads/workingbranch
authorXimin Luo <infinity0@debian.org>
Sat, 19 May 2018 20:10:33 +0000 (21:10 +0100)
committerXimin Luo <infinity0@debian.org>
Sat, 19 May 2018 20:10:33 +0000 (21:10 +0100)

Trivial merge