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

Conflicts:
	Admin/Runtime/Cache/Home/47491a116fe9b7d9a5649543a56e05e7.php
	Application/Runtime/Cache/Home/1223f42a89e823bf89547594651162de.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.php
	Application/Runtime/Logs/Home/14_12_29.log
	Application/Runtime/Logs/Home/14_12_30.log
	Discuz/upload/data/log/201412_cplog.php
	Discuz/upload/data/template/3_3_common_footer.tpl.php
	Discuz/upload/data/template/3_3_common_header_forum_index.tpl.php
	Discuz/upload/data/template/3_3_common_header_userstatus.tpl.php
	Discuz/upload/data/template/3_diy_forum_discuz.tpl.php
	Discuz/upload/data/template/3_diy_portal_index.tpl.php
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Discuz/upload/data/log/201412_cplog.php
1
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Home/Controller/IndexController.class.php
	Application/Runtime/Logs/Home/14_12_30.log
1
1
1
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Cache/Home/c09665db8c8380dc4786202d054ddd84.php
	Application/Runtime/Cache/Home/1223f42a89e823bf89547594651162de.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Cache/Home/46332caeb04b047fd87fdfb87d6df375.php
	Application/Runtime/Cache/Home/5a0aeb0186e12059f96778943e729364.php
	Application/Runtime/Cache/Home/6315a3b60704959f9f99b5b720e4544a.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.php
	Application/Runtime/Cache/Home/815fe5c8e771c9be8e15a1aa67d04a41.php
	Application/Runtime/Cache/Home/8ed741b6da9e3cf0b06484dfb6809ef8.php
	Application/Runtime/Cache/Home/9d459e48cece1d7473e65af45d1fe54a.php
	Application/Runtime/Cache/Home/bfc278d3a94da6d4c6f33cb788f985c8.php
	Application/Runtime/Logs/Home/14_12_29.log
	Application/Runtime/Logs/Home/14_12_30.log
	Discuz/upload/data/log/201412_cplog.php
	Discuz/upload/data/log/201412_errorlog.php
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
	Discuz/upload/data/template/1_1_common_header_member_logging.tpl.php
	Discuz/upload/data/template/1_1_common_header_portal_index.tpl.php
	Discuz/upload/data/template/1_1_member_login.tpl.php
	Discuz/upload/data/template/1_diy_portal_index.tpl.php
	Discuz/upload/data/template/1_levpop_lev.tpl.php
	Discuz/upload/data/template/3_3_common_footer.tpl.php
	Discuz/upload/data/template/3_3_common_header_userstatus.tpl.php
	Discuz/upload/data/template/3_diy_forum_discuz.tpl.php
1
1
1