From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 15:22:47 +0000 (-0500)
Subject: Merge branch 'master' into development
X-Git-Tag: 2.140.91^2~24
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=95841fc6ed58f9f24c1eaee8b81c2ce1d44969b9;p=feisty_meow.git

Merge branch 'master' into development

sucking in things from master branch
---

95841fc6ed58f9f24c1eaee8b81c2ce1d44969b9