tree 42d45baa97c79aa4670d7fed8bd8807f4dd6d78f
parent c7fffc30d090e3345e5360be01e2308605b33ef1
parent f67af4e16b3adc0d2c14fa5e2fdc594975e7fe40
author Matthias Sohn <matthias.sohn@sap.com> 1510336874 +0100
committer Matthias Sohn <matthias.sohn@sap.com> 1510358463 +0100

Merge branch 'stable-4.9'

* stable-4.9:
  Work around a Jsch bug: ensure the user name is set from URI
  Reintroduce protected method which removal broke EMF Compare

Change-Id: I335587eee279f91bd36c9ba9fc149b17a6db6110
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>