teaching plan new
Merge branch '1.1' of github.com:menxu/pin-2012-edu into 1.1
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