From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 12 Aug 2018 16:06:38 +0000 (-0400)
Subject: Manual merge of GitLab MR !1
X-Git-Tag: 2.3~1
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=inline;h=3ac5429fbbbb579c41e762f0a6173e52127ab133;hp=3ac5429fbbbb579c41e762f0a6173e52127ab133;p=super-star-trek.git

Manual merge of GitLab MR !1
---