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

Merge branch 'pryor'

Conflicts:
	schedule_of_topics.mdwn

Signed-off-by: Jim Pryor <profjim@jimpryor.net>
---

a744a63cf729a2074676228855a3fc8ba7525260