Merge branch 'pryor'
authorJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 03:52:21 +0000 (23:52 -0400)
committerJim Pryor <profjim@jimpryor.net>
Tue, 24 Aug 2010 03:52:21 +0000 (23:52 -0400)
commitb6e49b6bb965279c0af74175c3462787ca0a55a6
treea0c95e1b8548b85db6fc99250512c94b5bc2a133
parent1446bb7aa6ae004939ecad21ec44031c968955f0
parent04ad199a11e07f2f7669145dd3702ae248431e8c
Merge branch 'pryor'

Conflicts:
schedule_of_topics.mdwn

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