tree 244c38f7b4ce5fb7f1a379ac5c957559cd07f2db
parent 0f2a99786f26ef36abe53229be7615d4daa9f676
parent e899407f20ea31494aa4a52ba969a211f5411273
author Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1516964958 +0100
committer Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1516965271 +0100

Merge branch '13x'

# Conflicts:
#	tests/org.eclipse.emf.edapt.tests/META-INF/MANIFEST.MF

Change-Id: I7f00d04282544b1e4b4be5b7a727bb3f7c77149e
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>