Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:15:35 +0000 (15:15 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:15:35 +0000 (15:15 -0500)
commit9e96951ac621c4ded75ea5738980978779ad648d
treed83c3ebb0114145f2308aed2e26a4a588b3cc6c3
parentba7856d6defa542bba1b88b646eb5540431e0dda
parent76ed6415be63bf7f925c35a49bc642fcf5820e2e
Merge branch 'master' of feistymeow.org:feisty_meow

grabbing the latest from dev