Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 15:27:44 +0000 (10:27 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 15:27:44 +0000 (10:27 -0500)

Trivial merge