From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 14 Dec 2017 17:34:32 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e65955e38ff8ca42572d2ac78783613e058f8619;p=feisty_meow.git

Merge branch 'dev' of feistymeow.org:feisty_meow into dev
---

e65955e38ff8ca42572d2ac78783613e058f8619