Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 06:07:01 +0000 (01:07 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 06:07:01 +0000 (01:07 -0500)
getting synched


Trivial merge