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

Conflicts:
	Application/Runtime/Logs/Home/14_12_24.log
	discuz/upload/data/log/201412_illegallog.php
	discuz/upload/data/template/1_1_member_login.tpl.php
12