薛泰 哈哈哈哈哈 2013-11-21 22:10
Merge remote-tracking branch 'origin/xuetai1' into TrainLine1.0

Conflicts:
	src/cn/com/config/spring/applicationContext-dao.xml
	src/cn/com/dao/CourseDAO.java
	src/cn/com/dao/NoteDAO.java
commit