test15
Merge remote-tracking branch 'origin/master'

Conflicts:
	gittest/src/test/java/com/chinasofit/git/Test.java
Merge branch 'master' of https://github.com/xiaoxiao0630/jzgit.git

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