From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 23 Jan 2012 05:29:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://feistymeow.org/feisty_meow
X-Git-Tag: 2.140.90~1656^2~26
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=cf549fa1856a0c7b827c66cccd105f19e04c23b3;p=feisty_meow.git

Merge branch 'master' of ssh://feistymeow.org/feisty_meow
---

cf549fa1856a0c7b827c66cccd105f19e04c23b3
diff --cc scripts/custom/examples/fred/uva_profile_additions.txt
index 67657499,98c61d24..67657499
mode 100755,100644..100644
--- a/scripts/custom/examples/fred/uva_profile_additions.txt
+++ b/scripts/custom/examples/fred/uva_profile_additions.txt