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

Merge branch 'pryor'

Conflicts:
	schedule_of_topics.mdwn

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

b6e49b6bb965279c0af74175c3462787ca0a55a6