Merge branch 'pryor'

author Jim Pryor <profjim@jimpryor.net>

Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)

committer Jim Pryor <profjim@jimpryor.net>

Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
author Jim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
committer Jim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
diff --cc index.mdwn
Simple merge
diff --cc schedule_of_topics.mdwn
Simple merge
author	Jim Pryor <profjim@jimpryor.net>
	Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
committer	Jim Pryor <profjim@jimpryor.net>
	Tue, 24 Aug 2010 02:06:01 +0000 (22:06 -0400)
		1	2
index.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history
schedule_of_topics.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history