Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:16:23 +0000 (22:16 +0000)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:16:23 +0000 (22:16 +0000)
fluffing issues


Trivial merge