Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 1 Jan 2018 15:19:36 +0000 (10:19 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 1 Jan 2018 15:19:36 +0000 (10:19 -0500)

Trivial merge