Merge branch 'stable-4.7' into stable-4.8

author Matthias Sohn <matthias.sohn@sap.com>

Thu, 10 May 2018 10:08:46 +0000 (12:08 +0200)

committer Matthias Sohn <matthias.sohn@sap.com>

Thu, 10 May 2018 10:08:46 +0000 (12:08 +0200)
author Matthias Sohn <matthias.sohn@sap.com>
Thu, 10 May 2018 10:08:46 +0000 (12:08 +0200)
committer Matthias Sohn <matthias.sohn@sap.com>
Thu, 10 May 2018 10:08:46 +0000 (12:08 +0200)
diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge
diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
Simple merge
author	Matthias Sohn <matthias.sohn@sap.com>
	Thu, 10 May 2018 10:08:46 +0000 (12:08 +0200)
committer	Matthias Sohn <matthias.sohn@sap.com>
	Thu, 10 May 2018 10:08:46 +0000 (12:08 +0200)
		1	2
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties	patch \|	diff1 \|	diff2 \|	blob \| history
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java	patch \|	diff1 \|	diff2 \|	blob \| history