complete merge
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 03:54:35 +0000 (23:54 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 03:54:35 +0000 (23:54 -0400)
commitb4145a3d0bf4d083725fd717cf492852fa179478
tree6d10f7ad158f79052e1f610fdd308d8c94ea1079
parentb6e49b6bb965279c0af74175c3462787ca0a55a6
complete merge

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