From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 16 Oct 2018 00:58:15 +0000 (+0000)
Subject: Merge branch 'dev' of ssh://git.code.sf.net/p/feistymeow/trunk into dev
X-Git-Tag: 2.140.123^2~16
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=47231f11c91b2de6a11a74b940a04d28e7b2b818;hp=120c7cc2dba37e97bef87407ffb995c122ae60e0;p=feisty_meow.git

Merge branch 'dev' of ssh://git.code.sf.net/p/feistymeow/trunk into dev

more merging.  wheee.
---

diff --git a/.dev_bran b/.dev_bran
new file mode 100644
index 00000000..e91d326b
--- /dev/null
+++ b/.dev_bran
@@ -0,0 +1,2 @@
+
+tickling a check-in