From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 21 Nov 2017 06:05:13 +0000 (-0500)
Subject: Merge branch 'release-2.140.104'
X-Git-Tag: 2.140.104
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=84085bcd3554a3e80eacc4a887d9ede7b3e5def9;hp=52b5c840bd602f5fd9c28443cdbedf290b8ba3c1;p=feisty_meow.git

Merge branch 'release-2.140.104'

doc updates
---