Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 16 Dec 2017 22:07:43 +0000 (17:07 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 16 Dec 2017 22:07:43 +0000 (17:07 -0500)

Trivial merge