commit 902977b3606bd2b9e5619a8b177acd35b76535f1
author Lorenzo Bettini <lorenzo.bettini@gmail.com> Mon Aug 04 17:18:41 2014 +0200
committer Lorenzo Bettini <lorenzo.bettini@gmail.com> Mon Aug 04 17:18:41 2014 +0200
tree d6aebfc1bd853f43d9e1ae22f340e15b69446b07
parent 743735c6e129e51eb8d94d2f9ef43b232bc505cd
parent 0e11a5b01ea957369c28b1a02b7c44eb745da55f

Merge remote-tracking branch 'origin/master' into tycho

Conflicts:
	features/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
	tests/org.eclipse.emf.parsley.tests.swtbot.cdo/src/org/eclipse/emf/parsley/tests/swtbot/cdo/treeform/CDOTreeFormDirtyAndSaveableTests.java
	tests/org.eclipse.emf.parsley.tests.swtbot/EmfParsleyDslEditorTests.launch
	tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
	tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/EmfParsleyAbstractTests.java

Change-Id: Ibc22f87bd3c4565753d9e53699a193225e04172c