From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 21 Jan 2022 16:40:53 +0000 (+0000)
Subject: merge various things from master
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e3729a9039462c460dae4804f40c0bd506f3423;hp=7e3729a9039462c460dae4804f40c0bd506f3423;p=spider.git

merge various things from master

This is a major attempt at joining the two codebases together
better so that it is easier to add joint features. But this
is likely to be the last time I do this.
---