星期
某个章节下的作业列表清单页面
new timeline
g2 g3
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
Merge branch '1.1' of git://github.com/menxu/pin-2012-edu into 1.1

Conflicts:
	pin-edu-sns/app/views/courses/demo_teaching_plan_new.html.haml
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
minor fixes
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
teaching plan demo show2
g3 to h1
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
a1 minor fixes
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
给g1
Merge branch '1.1' of git://github.com/menxu/pin-2012-edu into 1.1
merge
初步完成
填写 demo2 演示用数据
g4