Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 12 Feb 2019 15:12:08 +0000 (10:12 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 12 Feb 2019 15:12:08 +0000 (10:12 -0500)

Trivial merge