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)
commita744a63cf729a2074676228855a3fc8ba7525260
treefc2980e65d1317f4b70db2f82b6996bd35a77ece
parent97fc901510ad589c12c4d0cec6c5683bec750678
parent503136d0c685c3e9c0f2768aa4a8ba44e48ef1d9
Merge branch 'pryor'

Conflicts:
schedule_of_topics.mdwn

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