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

Trivial merge