add
ad
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_22.log
	Application/Runtime/Logs/Home/14_12_23.log
	Bbs/Runtime/Cache/Home/10fa7d71a0129e1ff290dff3a5fb2773.php
	Bbs/Runtime/Logs/Home/14_12_22.log
	Bbs/Runtime/Logs/Home/14_12_23.log
Merge branch 'master' of https://github.com/zhaolun/mybbs
add
asd
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_23.log
	Bbs/Runtime/Logs/Home/14_12_23.log
	Discuz/upload/data/log/201412_cplog.php
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
	Discuz/upload/data/template/1_1_common_header_home_space.tpl.php
	Discuz/upload/data/template/1_1_home_space_menu.tpl.php
	Discuz/upload/data/template/1_1_home_space_profile.tpl.php