From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 23 Nov 2017 05:10:30 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~27
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=c365b9f59ad5523b2f9b5e415d82aa2a0559d57c;hp=--cc;p=feisty_meow.git

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

c365b9f59ad5523b2f9b5e415d82aa2a0559d57c