Merge branch 'master' of ssh://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Mon, 23 Jan 2012 05:29:18 +0000 (00:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 23 Jan 2012 05:29:18 +0000 (00:29 -0500)
commitcf549fa1856a0c7b827c66cccd105f19e04c23b3
tree57d93e864fbf5d82cab25d1f8c0c25a7d48b51e3
parent03618db506abd7803a9705f647b01f41c820dc6a
parentb6dfd3cfa5f7d14bc43f88ef8fdc1d25484b731f
Merge branch 'master' of ssh://feistymeow.org/feisty_meow
scripts/custom/examples/fred/uva_profile_additions.txt