Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 12 Dec 2017 14:12:51 +0000 (14:12 +0000)
committerChris Koeritz <fred@gruntose.com>
Tue, 12 Dec 2017 14:12:51 +0000 (14:12 +0000)

Trivial merge