Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Thu, 16 Nov 2017 18:31:38 +0000 (13:31 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 16 Nov 2017 18:31:38 +0000 (13:31 -0500)

Trivial merge