Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 03:51:35 +0000 (22:51 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 03:51:35 +0000 (22:51 -0500)
commit91441c16e9dca416743fe1ab7b2eb883a39b12ae
tree438470efa164baec2a78201a68e7fe052414fd78
parentbd2cc8375efd80771088161ba31e41a521523c26
parent5dacef4621a07b9289d3ec6882862b7d2390387f
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93

back on release branch