Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Thu, 16 Nov 2017 14:46:25 +0000 (09:46 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 16 Nov 2017 14:46:25 +0000 (09:46 -0500)

Trivial merge