Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Mon, 13 Nov 2017 01:45:47 +0000 (01:45 +0000)
committerChris Koeritz <fred@gruntose.com>
Mon, 13 Nov 2017 01:45:47 +0000 (01:45 +0000)

Trivial merge