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

Trivial merge