Merge branch 'stable-4.2'
commit6728df2e58f0c296922072cd08795369d4746a6f
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 20 Jan 2016 21:24:21 +0000 (20 22:24 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 20 Jan 2016 21:44:37 +0000 (20 22:44 +0100)
tree5badb548f38b1a21fe401aeb0c6b929310cbd6c1
parente16d66702290748a02056832aa4bfbfaee9e39c0
parent4b243ed761ec170c2ed2ff0bcf63ee1ab5d7fc7b
Merge branch 'stable-4.2'

* stable-4.2:
  Prepare 4.2.0-SNAPSHOT builds
  Remove psf feature from tools/version.sh
  EGit v4.2.0.201512141825-rc1

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