Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
commit2bfe2dd7229e77118182ed283cede3a358f6ed8a
treee257dfe7d76c9c26768b34cbbf5c4f87a96488f6
parentab0ec00e0e06da2fdbed6542e34b1189021e0278
parent1cdc0cd0502fbaaabbcf5b4d4b465b94873cc9ac
Merge branch 'pryor'
index.mdwn
schedule_of_topics.mdwn