Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 24 Nov 2017 22:43:13 +0000 (17:43 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 24 Nov 2017 22:43:13 +0000 (17:43 -0500)

Trivial merge