Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorFred T. Hamster <fred@gruntose.com>
Wed, 20 Dec 2017 03:12:40 +0000 (22:12 -0500)
committerFred T. Hamster <fred@gruntose.com>
Wed, 20 Dec 2017 03:12:40 +0000 (22:12 -0500)

Trivial merge