From: Fred T. Hamster <fred@gruntose.com>
Date: Sun, 12 Nov 2017 05:13:14 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~3^2~5^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b100c8248c3967b7245fbecd76d5cba2d5f9f954;p=feisty_meow.git

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

merging onto wildmutt
---

b100c8248c3967b7245fbecd76d5cba2d5f9f954