Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 19:56:21 +0000 (14:56 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 19:56:21 +0000 (14:56 -0500)

Trivial merge