tree 7de7f68b5258879999887a9468cd2736ea233bcc
parent a06db1c72b1ba2ad25ec318470253681d4a79edf
parent 552ecbf0eeafd8b9c22649761ed1acfdaa6a08e0
author Antonio Campesino <antonio.campesino.robles@ericsson.com> 1569325765 +0200
committer Antonio Campesino <antonio.campesino.robles@ericsson.com> 1569325765 +0200

Merge branch 'master' into master-juno

Conflicts:
	pom.xml
	releng/org.eclipse.gendoc.target/2018-09/2018-09-papyrus.target
	releng/org.eclipse.gendoc.target/2018-09/2018-09-sirius.target

Change-Id: I3cc1e3fd17ed67e33c818bfee0169f51710aa6a4