Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 13 Nov 2017 04:25:57 +0000 (23:25 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 13 Nov 2017 04:25:57 +0000 (23:25 -0500)

Trivial merge