Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 18 Nov 2017 03:07:49 +0000 (22:07 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 18 Nov 2017 03:07:49 +0000 (22:07 -0500)

Trivial merge