test commit
test commit
Author: leonshao
Description: 补齐提交
Merge branch 'leonshao-develop' into develop

Conflicts:
	data/log/201407_cplog.php
	data/template/1_1_common_header_forum_index.tpl.php
	data/template/1_1_member_login.tpl.php
Author: leonshao
Description: 修复merge分支时的文件冲突
Author: leonshao
Description: 修复合并分支时的文件冲突
view change
delete log
Merge branch 'master' into develop

Conflicts:
	data/template/1_1_common_footer.tpl.php
	data/template/1_1_common_header_forum_forumdisplay.tpl.php
	data/template/1_1_common_header_forum_index.tpl.php
	data/template/1_1_common_header_forum_viewthread.tpl.php
	data/template/1_1_common_header_portal_index.tpl.php
	data/template/1_1_forum_viewthread_poll.tpl.php
	data/template/1_diy_forum_forumdisplay.tpl.php
	data/template/1_diy_forum_viewthread.tpl.php
fix
Delete 1_1_common_extcredits.tpl.php
Delete 1_1_common_extgroups.tpl.php
Delete 1_1_common_footer.tpl.php
Delete 1_1_common_footer_ajax.tpl.php
Delete 1_1_common_header_ajax.tpl.php
Delete 1_1_common_header_diy.tpl.php
Delete 1_1_common_header_diynav.tpl.php
Delete 1_1_common_header_forum_forumdisplay.tpl.php
Delete 1_1_common_header_forum_index.tpl.php
Delete 1_1_common_header_forum_post.tpl.php