Merge branch 'master' into deploy.spirit
authorMark Wooding <mdw@distorted.org.uk>
Thu, 7 May 2020 01:24:50 +0000 (02:24 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 7 May 2020 01:24:50 +0000 (02:24 +0100)
commit76b8f63e9069432b591f70598792e6a00ec795ea
tree1c105589179eb9c786ab795668477b1e7ff6fbf2
parent8cc02f292047f4dbfa8b31d3cd8e078bc3658fe8
parent704c25a19945717f81ec0d9eb601c59edae26686
Merge branch 'master' into deploy.spirit

* master:
  etc/sbuild.conf.in: Don't run complicated Debian testing by default.