Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 14:22:08 +0000 (09:22 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 14:22:08 +0000 (09:22 -0500)

Trivial merge