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

Conflicts:
	Application/Runtime/Logs/Home/14_12_29.log
s
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Cache/Home/47491a116fe9b7d9a5649543a56e05e7.php
	Application/Home/Controller/IndexController.class.php
	Application/Runtime/Logs/Home/14_12_29.log
	Discuz_X3.2_SC_UTF8/upload/data/template/1_1_common_header_forum_index.tpl.php
add
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_29.log
aa
Merge branch 'master' of https://github.com/zhaolun/mybbs

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

Conflicts:
	Admin/Runtime/Cache/Home/a661b7d827ef72760c7c23d4f99c604c.php
	Application/Runtime/Logs/Home/14_12_29.log
add
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Cache/Home/804b7cf88273dd2fecb7afc145611b9d.php
	Admin/Runtime/Cache/Home/a661b7d827ef72760c7c23d4f99c604c.php
	Application/Runtime/Logs/Home/14_12_29.log
add
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Admin/Runtime/Cache/Home/804b7cf88273dd2fecb7afc145611b9d.php
	Application/Runtime/Logs/Home/14_12_29.log