Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 14:25:33 +0000 (09:25 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 14:25:33 +0000 (09:25 -0500)

Trivial merge