Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Wed, 15 Nov 2017 19:13:29 +0000 (14:13 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 15 Nov 2017 19:13:29 +0000 (14:13 -0500)

Trivial merge