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

Trivial merge