Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Thu, 21 Dec 2017 14:32:05 +0000 (09:32 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 21 Dec 2017 14:32:05 +0000 (09:32 -0500)

Trivial merge