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

Trivial merge