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

Trivial merge