Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Wed, 15 Nov 2017 18:57:29 +0000 (13:57 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 15 Nov 2017 18:57:29 +0000 (13:57 -0500)

Trivial merge