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

Trivial merge