Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 17 Dec 2017 13:16:01 +0000 (08:16 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 17 Dec 2017 13:16:01 +0000 (08:16 -0500)

Trivial merge