Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 14 Nov 2017 12:34:23 +0000 (07:34 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 14 Nov 2017 12:34:23 +0000 (07:34 -0500)

Trivial merge