Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 07:43:34 +0000 (07:43 +0000)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 07:43:34 +0000 (07:43 +0000)
bringing in the newest changes.


Trivial merge