1
1
Merge branch 'master' into zhaolun

Conflicts:
	Admin/Runtime/Logs/Home/14_12_18.log
1
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Logs/Home/14_12_18.log