12
21
Merge branch 'master' of github.com:123jian/bbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_27.log
	discuz/upload/data/template/2_diy_forum_discuz.tpl.php