Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 22:23:03 +0000 (22:23 +0000)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 22:23:03 +0000 (22:23 +0000)

Trivial merge