From: Raspbian forward pporter <root@raspbian.org>
Date: Thu, 2 Nov 2017 21:52:02 +0000 (+0000)
Subject: pseudomerge to tie together broken upstream history
X-Git-Tag: archive/raspbian/1.20.0+dfsg1-1+rpi1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7d25421a4654482e783ecc860b9772223ba8651a;p=rustc.git

pseudomerge to tie together broken upstream history
---

7d25421a4654482e783ecc860b9772223ba8651a