提交我的
1
Merge branch 'master' of https://github.com/cxc222/weibo

Conflicts:
	.gitignore
	_runtime/datacache/0/6/TS_063d9d52c39156318395e50e16d1460b.php
	_runtime/datacache/1/8/TS_18cb852a8d00e478abce001eb96f8232.php
	_runtime/datacache/2/4/TS_242f8b00510d0a2961d5aa90554b80ba.php
	_runtime/datacache/3/8/TS_38067a39c0fec4846dcce0378e9e2eb7.php
	_runtime/datacache/4/1/TS_418e2035dd0c690528587584f10a7ea8.php
	_runtime/datacache/4/2/TS_42f192c49da35b440e09e3f576afe96e.php
	_runtime/datacache/4/3/TS_43c18298030ade8fc3bf1d344221b276.php
	_runtime/datacache/4/4/TS_44e065d6f17952d70d56368879fb8149.php
	_runtime/datacache/5/d/TS_5d3a6782d5f9e659b026f108b9ae1a97.php
	_runtime/datacache/7/d/TS_7d9e4f453ed3e3a29410a8d27cecf07d.php
	_runtime/datacache/7/e/TS_7e28ec52d32c6929f9e48a0ba34e7bec.php
	_runtime/datacache/8/a/TS_8a40d3814ea150a03c6092b8b173da32.php
	_runtime/datacache/9/9/TS_993b211a245a51f6a26925f694105cd7.php
	_runtime/datacache/a/6/TS_a6cbd1b9cc5aca6d634691d709e0e0e0.php
	_runtime/datacache/c/0/TS_c04dec70f365cae75674cf9494e94ba5.php
	_runtime/datacache/d/3/TS_d3d6446940003e3e8b8657f693f71b42.php
	_runtime/datacache/d/c/TS_dc63f9b4e76bf505de071246fd1acddb.php
	_runtime/datacache/e/9/TS_e9955b3d770cd82abc88b29f80c6fe9b.php
	_runtime/filecache/_xdata_lget_admin_nav.php
	data/lang/public_en.php
	data/lang/public_zh-cn.php
	data/lang/public_zh-tw.php