Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Wed, 20 Dec 2017 01:38:35 +0000 (20:38 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 20 Dec 2017 01:38:35 +0000 (20:38 -0500)

Trivial merge