Merge branch 'branch-1.9' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 26 Feb 2020 06:58:18 +0000 (23:58 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 26 Feb 2020 06:58:18 +0000 (23:58 -0700)

Trivial merge