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

Trivial merge