Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:20:38 +0000 (22:20 +0000)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:20:38 +0000 (22:20 +0000)
getting latest from dev


Trivial merge