Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:53:27 +0000 (11:53 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 15 Jan 2018 16:53:27 +0000 (11:53 -0500)

Trivial merge