Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Thu, 14 Dec 2017 18:37:36 +0000 (13:37 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 14 Dec 2017 18:37:36 +0000 (13:37 -0500)

Trivial merge