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

Trivial merge