Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 01:47:55 +0000 (01:47 +0000)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 01:47:55 +0000 (01:47 +0000)

Trivial merge