From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 18:34:44 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~14^2~2
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=b5af993db57d2e969ac2e6011d65fd075365cf25

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

b5af993db57d2e969ac2e6011d65fd075365cf25