From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 15 Jan 2018 16:48:06 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 2.140.109^2~14^2~1^2^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=fcfb763b7b0ee0276db0f0fca5e20b07961b04e8;p=feisty_meow.git

Merge branch 'master' into dev

pulling in latest release into dev.
should only be the tag.  if that.
---

fcfb763b7b0ee0276db0f0fca5e20b07961b04e8