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

Conflicts:
	Application/Home/Conf/config.php
	Application/Runtime/Cache/Home/0374c5acea31cb0bf186f4a88594a9aa.php
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/9ff23458f76166d2c8b2f222398313f0.php
	Application/Runtime/Cache/Home/ace8e6e4fb1f39f9cad743f196c3c6d5.php
	Application/Runtime/Cache/Home/b1d2f525b5f86616759022a0bb428579.php
	Application/Runtime/Logs/Admin/14_12_24.log
	Application/Runtime/Logs/Home/14_12_24.log