feisty_meow.git
7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 05:15:23 +0000 (00:15 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Sun, 12 Nov 2017 05:13:14 +0000 (00:13 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merging onto wildmutt

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 05:07:45 +0000 (00:07 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 05:07:27 +0000 (00:07 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:45:58 +0000 (23:45 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:45:14 +0000 (23:45 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:44:05 +0000 (23:44 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:26:42 +0000 (23:26 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:26:40 +0000 (23:26 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:07:43 +0000 (23:07 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:07:22 +0000 (04:07 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 04:06:30 +0000 (23:06 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:58:45 +0000 (22:58 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:56:30 +0000 (22:56 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

pulling fix for version control generated list file

7 years agofix for confused removal of list file
Chris Koeritz [Sun, 12 Nov 2017 03:55:59 +0000 (03:55 +0000)]
fix for confused removal of list file

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:55:59 +0000 (03:55 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 12 Nov 2017 03:54:32 +0000 (03:54 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 12 Nov 2017 03:54:10 +0000 (03:54 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 12 Nov 2017 03:54:08 +0000 (03:54 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:48:53 +0000 (22:48 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoaha, defective sudo alias was at fault
Chris Koeritz [Sun, 12 Nov 2017 03:48:37 +0000 (22:48 -0500)]
aha, defective sudo alias was at fault

7 years agohmmm, somehow not responding right
Chris Koeritz [Sun, 12 Nov 2017 03:43:58 +0000 (22:43 -0500)]
hmmm, somehow not responding right

i cause a failure of first sudo, but the script does not stop.  it just
merrily goes to the next step.  not cool.

7 years agoa few aliases that automatically add sudo.
Chris Koeritz [Sun, 12 Nov 2017 03:37:55 +0000 (22:37 -0500)]
a few aliases that automatically add sudo.

7 years agorequiring root access on this now.
Chris Koeritz [Sun, 12 Nov 2017 03:33:17 +0000 (22:33 -0500)]
requiring root access on this now.

7 years agomodernized this permission script
Chris Koeritz [Sun, 12 Nov 2017 03:32:00 +0000 (22:32 -0500)]
modernized this permission script

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:25:43 +0000 (22:25 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agodropped setting of umask for people
Chris Koeritz [Sun, 12 Nov 2017 03:25:25 +0000 (22:25 -0500)]
dropped setting of umask for people

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:25:25 +0000 (22:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:21:38 +0000 (22:21 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agogets rid of double slashes in aliases
Chris Koeritz [Sun, 12 Nov 2017 03:21:24 +0000 (22:21 -0500)]
gets rid of double slashes in aliases

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:18:47 +0000 (22:18 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agosite standup needs to be sudo
Chris Koeritz [Sun, 12 Nov 2017 03:06:23 +0000 (22:06 -0500)]
site standup needs to be sudo

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 03:05:46 +0000 (22:05 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 02:54:40 +0000 (21:54 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 02:37:36 +0000 (21:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 02:29:12 +0000 (21:29 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 02:28:54 +0000 (21:28 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 02:26:39 +0000 (02:26 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:50:22 +0000 (20:50 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agocleaned up a temp file for version control
Chris Koeritz [Sun, 12 Nov 2017 01:48:55 +0000 (01:48 +0000)]
cleaned up a temp file for version control

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:48:55 +0000 (01:48 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:35:28 +0000 (20:35 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:30:04 +0000 (20:30 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agodropped the older crud at bottom of the file
Chris Koeritz [Sun, 12 Nov 2017 01:29:50 +0000 (20:29 -0500)]
dropped the older crud at bottom of the file

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:29:50 +0000 (20:29 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:26:48 +0000 (20:26 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoadded diagnostics to say the user type
Chris Koeritz [Sun, 12 Nov 2017 01:25:32 +0000 (20:25 -0500)]
added diagnostics to say the user type

7 years agonice mod to support connecting root also
Chris Koeritz [Sun, 12 Nov 2017 01:21:00 +0000 (20:21 -0500)]
nice mod to support connecting root also

now the root user can run the connect feisty meow process on its own startup file, by providing the --root flag to the connect_feisty_meow script.  this is important, since it is never recommended to load a big scripting environment for root by default.  too much depends on root's commands being exactly what they seem, rather than having been aliased.  anyway, the root user can run fredme or feistyme to load up the script environment.

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:21:00 +0000 (20:21 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:11:32 +0000 (20:11 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:08:01 +0000 (20:08 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:04:02 +0000 (20:04 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:03:57 +0000 (20:03 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:02:53 +0000 (20:02 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoinformational aliases about feisty meow itself
Chris Koeritz [Sun, 12 Nov 2017 01:01:17 +0000 (20:01 -0500)]
informational aliases about feisty meow itself

starting with feisty_branch to report what branch feisty meow is on currently.

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:01:17 +0000 (20:01 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 01:00:16 +0000 (20:00 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 00:34:26 +0000 (19:34 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 00:10:29 +0000 (19:10 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 12 Nov 2017 00:03:18 +0000 (19:03 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 22:27:35 +0000 (17:27 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 22:25:26 +0000 (17:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 22:24:46 +0000 (17:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Sat, 11 Nov 2017 22:24:06 +0000 (17:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 22:23:03 +0000 (22:23 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 22:22:54 +0000 (17:22 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merging

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 22:22:52 +0000 (17:22 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'dev' of git://feistymeow.org/feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 21:01:52 +0000 (16:01 -0500)]
Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

7 years agomore coagulation of the rev ctrl output
Chris Koeritz [Sat, 11 Nov 2017 20:58:26 +0000 (15:58 -0500)]
more coagulation of the rev ctrl output

as my mom might have said.  this is a nice couple fixes to smoosh as much of the git and other tool output as possible.  also added checks on the pipe status in places that needed it.

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 20:57:35 +0000 (15:57 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merge

7 years agoMerge branch 'master' of git://feistymeow.org/feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 20:47:24 +0000 (15:47 -0500)]
Merge branch 'master' of git://feistymeow.org/feisty_meow

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 18:12:06 +0000 (13:12 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev

merging with latest release

7 years agoMerge branch 'release-2.140.97' 2.140.97
Chris Koeritz [Sat, 11 Nov 2017 18:10:15 +0000 (13:10 -0500)]
Merge branch 'release-2.140.97'

merging in fixes for push repo upstream

7 years agonew version release-2.140.97
Chris Koeritz [Sat, 11 Nov 2017 18:08:51 +0000 (13:08 -0500)]
new version

7 years agodropped commented code
Chris Koeritz [Sat, 11 Nov 2017 18:06:38 +0000 (13:06 -0500)]
dropped commented code

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 18:01:35 +0000 (13:01 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merginx

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 18:01:33 +0000 (13:01 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev

7 years agofixes problems in push repo downstream
Chris Koeritz [Sat, 11 Nov 2017 17:58:54 +0000 (17:58 +0000)]
fixes problems in push repo downstream

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:49:35 +0000 (17:49 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

hmmm, merge loop?

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:49:25 +0000 (17:49 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

merging

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:47:59 +0000 (17:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:47:43 +0000 (17:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:47:37 +0000 (17:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:47:33 +0000 (17:47 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow

7 years agoMerge branch 'master' of git://feistymeow.org/feisty_meow
Chris Koeritz [Sat, 11 Nov 2017 17:26:01 +0000 (12:26 -0500)]
Merge branch 'master' of git://feistymeow.org/feisty_meow

getting to local master

7 years agoMerge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 17:15:38 +0000 (12:15 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 13:32:55 +0000 (08:32 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev

bring in the release from master

7 years agoMerge branch 'release-2.140.96' 2.140.96
Chris Koeritz [Sat, 11 Nov 2017 13:30:39 +0000 (08:30 -0500)]
Merge branch 'release-2.140.96'

the promised crucial fix

7 years agoMerge branch 'release-2.140.96' into dev
Chris Koeritz [Sat, 11 Nov 2017 13:29:48 +0000 (08:29 -0500)]
Merge branch 'release-2.140.96' into dev

bringing in that crucial fix, finally.  only needed to wake up at 6am on saturday to get it going.

7 years agoa couple other tiny fixes release-2.140.96
Chris Koeritz [Sat, 11 Nov 2017 13:27:14 +0000 (08:27 -0500)]
a couple other tiny fixes

7 years agolast edit before going to press
Chris Koeritz [Sat, 11 Nov 2017 13:22:44 +0000 (08:22 -0500)]
last edit before going to press

7 years agoeven tastier
Chris Koeritz [Sat, 11 Nov 2017 13:18:30 +0000 (08:18 -0500)]
even tastier

now fewer lines and the exec is out of my face.

7 years agoworking finally. argh.
Chris Koeritz [Sat, 11 Nov 2017 13:13:07 +0000 (08:13 -0500)]
working finally.  argh.

this is a complicated bit of twisty scripting.  thanks to article here for an approach that actually works for starting bash and keeping it resident, unlike several approaches that i tried: https://unix.stackexchange.com/questions/123103/how-to-keep-bash-running-after-command-execution

7 years agoargh, this has to start working soon
Chris Koeritz [Sat, 11 Nov 2017 12:53:41 +0000 (07:53 -0500)]
argh, this has to start working soon

7 years agoargh, the crucial fix still not working.
Chris Koeritz [Sat, 11 Nov 2017 07:08:47 +0000 (02:08 -0500)]
argh, the crucial fix still not working.

it was at one point fine, but now has mutated.  needs more work.

7 years agoMerge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 11 Nov 2017 06:07:01 +0000 (01:07 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev

getting synched

7 years agoMerge branch 'release-2.140.95' 2.140.95
Chris Koeritz [Sat, 11 Nov 2017 06:05:33 +0000 (01:05 -0500)]
Merge branch 'release-2.140.95'

dragging in crucial mod

7 years agostarting new release to get promised change out release-2.140.95
Chris Koeritz [Sat, 11 Nov 2017 06:05:04 +0000 (01:05 -0500)]
starting new release to get promised change out

7 years agoMerge branch 'release-2.140.94' into dev
Chris Koeritz [Sat, 11 Nov 2017 06:03:40 +0000 (01:03 -0500)]
Merge branch 'release-2.140.94' into dev

grabbing crucial fix to be able to spin a new release

7 years agoMerge branch 'release-2.140.94' of feistymeow.org:feisty_meow into release-2.140.94
Chris Koeritz [Sat, 11 Nov 2017 06:02:34 +0000 (01:02 -0500)]
Merge branch 'release-2.140.94' of feistymeow.org:feisty_meow into release-2.140.94

merging crucial fix