From: Jim Pryor <profjim@jimpryor.net>
Date: Tue, 24 Aug 2010 21:52:36 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=a64d5962079b2ef8f692bb2fbbaeec7131d04fab;hp=bcad83c70fc1e5484544d4013e31b190b54754a0

Merge branch 'pryor'
---

diff --git a/family_tree_of_functional_languages.mdwn b/family_tree_of_functional_programming_languages.mdwn
similarity index 100%
rename from family_tree_of_functional_languages.mdwn
rename to family_tree_of_functional_programming_languages.mdwn