Merge branch 'master' into deploy.universe
authorMark Wooding <mdw@distorted.org.uk>
Sat, 9 May 2020 16:09:19 +0000 (17:09 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 9 May 2020 16:09:19 +0000 (17:09 +0100)
* master:
  Makefile, bin/chroot-maint: Keep `/usr/local/include' mostly empty.
  etc/sbuild.conf.in: Don't run complicated Debian testing by default.


Trivial merge