c1 c2 c3 d1 f1
e1 e2
teaching plan show
Merge branch '1.1' of git://github.com/menxu/pin-2012-edu into 1.1
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1
some fixes
穿起来
merge
some fixes
Merge branch '1.1' of github.com:mindpin-shcmusic/pin-2012-edu into 1.1

Conflicts:
	pin-edu-sns/app/views/courses/demo_teaching_plan_show.html.haml
js effect
Merge branch '1.1' of git://github.com/mindpin-shcmusic/pin-2012-edu into 1.1

Conflicts:
	pin-edu-sns/app/views/courses/demo_teaching_plan_new.html.haml