From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 25 Nov 2018 19:06:33 +0000 (+0000)
Subject: pseudomerge to tie together broken upstream history
X-Git-Tag: archive/raspbian/1.30.0+dfsg1-2+rpi1~1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=06d6fd5919ed5c2f0df945e8857430b8d6ff1b92;p=rustc.git

pseudomerge to tie together broken upstream history
---

06d6fd5919ed5c2f0df945e8857430b8d6ff1b92