Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 12 Dec 2017 11:25:01 +0000 (06:25 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 12 Dec 2017 11:25:01 +0000 (06:25 -0500)

Trivial merge