From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 29 Dec 2017 16:27:25 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.107^2~2^2~12
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a519377563fb2790b73dfbf01ad81d2ca22de0d1;p=feisty_meow.git

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

a519377563fb2790b73dfbf01ad81d2ca22de0d1