Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 18 Dec 2017 15:50:07 +0000 (15:50 +0000)
committerChris Koeritz <fred@gruntose.com>
Mon, 18 Dec 2017 15:50:07 +0000 (15:50 +0000)

Trivial merge