From: Raspbian forward pporter <root@raspbian.org>
Date: Sun, 26 Aug 2018 13:36:08 +0000 (+0100)
Subject: pseudomerge to tie together broken upstream history
X-Git-Tag: archive/raspbian/1.28.0+dfsg1-2+rpi1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9aaf48bf037cb0364a9c581419e8e3fd32e28cb3;p=rustc.git

pseudomerge to tie together broken upstream history
---

9aaf48bf037cb0364a9c581419e8e3fd32e28cb3