3
Merge branch 'master' of https://github.com/kongfanxing/yii_test

Conflicts:
	demos/blog/protected/config/main.php
	demos/blog/protected/runtime/application.log
1
1
1