dfg
Merge branch 'master' of git@github.com:getnut/MyBlog.git

Conflicts:
	WebRoot/WEB-INF/urlrewrite.xml
	WebRoot/dp/main.jsp
工作呀！
Merge branch 'dev_2'

Conflicts:
	WebRoot/dp/main.jsp
add 1.txt
master add!
sdfsdfssdfsddfs
fd
hy
Merge branch 'dev_blog_version1.0'
dsfsfsf
很久很久
ddd
Merge branch 'master' of git@github.com:getnut/MyBlog.git into dev_blog_version1.0

Conflicts:
	WebRoot/WEB-INF/classes/com/blog/common/BlogActionType.class
	WebRoot/WEB-INF/classes/com/blog/controller/BlogController.class
	WebRoot/WEB-INF/classes/com/blog/dao/ClassDao.class
	WebRoot/WEB-INF/classes/com/blog/dao/impl/ClassDaoImpl.class
	WebRoot/dp/main.jsp
	WebRoot/resource/styles/main.css
	WebRoot/resource/styles/manage.css
	src/com/blog/common/BlogActionType.java
	src/com/blog/dao/ClassDao.java
	src/com/blog/dao/impl/ClassDaoImpl.java
f