Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 05:57:53 +0000 (00:57 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 05:57:53 +0000 (00:57 -0500)
commitcd58e16dc150f5130a28360ada85d51c8ac78c71
tree0d5011342b84feebffd7dc5a1cec156626973bc8
parent989a03f57ae0f296d87f7aa9e17d44e1dc531461
parente5eb2d2f1fa726079af1111cc544b23d8ca567cf
Merge branch 'master' of feistymeow.org:feisty_meow into dev

getting dev in synch with new master branch