Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 03:39:09 +0000 (23:39 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 03:39:09 +0000 (23:39 -0400)
Conflicts:
schedule_of_topics.mdwn

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

Trivial merge