Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 16 Dec 2017 21:33:51 +0000 (16:33 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 16 Dec 2017 21:33:51 +0000 (16:33 -0500)

Trivial merge