Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 18 Dec 2017 21:34:26 +0000 (16:34 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 18 Dec 2017 21:34:26 +0000 (16:34 -0500)

Trivial merge