Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92 release-2.140.92
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:32:46 +0000 (17:32 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:32:46 +0000 (17:32 -0500)
commit668c41b51990bc1b1a862ed09a33ac6f9cd16084
treefd206f86ada90cd8cf4933ceb3ff363af10d1a79
parent2072733f108c8b605b24a01baa43759403b00f49
parent7d02b432a44692f8b7d89559c07cbdc9cbe04381
Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92

updates from dev branch