From: Dirk Koopman <djk@tobit.co.uk>
Date: Thu, 9 Jul 2020 20:10:07 +0000 (+0100)
Subject: Merge branch 'users.v3j' into mojo
X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=3b73a2dde8b378db6b56438699c5a1f233194dbf;hp=9e0b89e54c3d1de91994935fcdb96c24318a254b;p=spider.git

Merge branch 'users.v3j' into mojo
---

diff --git a/Changes b/Changes
index 3ff74402..74bc922b 100644
--- a/Changes
+++ b/Changes
@@ -10,7 +10,8 @@
    I use both terms (whenever I remembered) in the help text.
 5. Help text has been written.
 6. The UPGRADE.mojo file has been tweeked to point out the users file format
-   change. 
+   change.
+7. Merge in users.v3j to the mojo branch.
 07Jul20=======================================================================
 1. Fix show/node command.
 2. Fix show/cluster command to take into account the presence of skimmer nodes