Merge branch 'deploy' of git.distorted.org.uk:/home/mdw/publish/public-git/distorted...
authorMark Wooding <mdw@distorted.org.uk>
Fri, 20 Sep 2019 19:11:25 +0000 (20:11 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 20 Sep 2019 19:11:25 +0000 (20:11 +0100)
commit2465c0f183b54c77715843eb713a762e6aec7d58
tree6a83cc1084becb88dd52e7e386f6e8bf61a30080
parent73952373401377b2113fc265586a17115cc6a546
parent4de904fb31c2664ab6934f3828e43a8a044b11dd
Merge branch 'deploy' of git.distorted.org.uk:/home/mdw/publish/public-git/distorted-chroot into deploy.crybaby

* 'deploy' of git.distorted.org.uk:/home/mdw/publish/public-git/distorted-chroot:
  Makefile: Don't commit to `PROXY' before we know `$(APTCONF)'.