Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 15 Dec 2017 14:36:26 +0000 (09:36 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 15 Dec 2017 14:36:26 +0000 (09:36 -0500)

Trivial merge