index on master: ffda70c 中文
中文_stash
加上中文提交
Merge remote-tracking branch 'origin/chinase_stash' into chinase_stash
Merge remote-tracking branch 'origin/chinase_stash'

Conflicts:
	gittest/src/test/java/com/chinasofit/git/Test.java