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

Conflicts:
	Application/Runtime/Cache/Home/2a94b8bda04ff446dcedd42276fc99ee.php
	Application/Runtime/Cache/Home/455a6242d1c94ccc41106a388080363b.php
	Application/Runtime/Cache/Home/46332caeb04b047fd87fdfb87d6df375.php
	Application/Runtime/Cache/Home/66e219a2cd4e1e4ec379eed18e194fd6.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
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
1