tree 230ffdf7f607a86b726c2c4a057fc66bbf92b7cc
parent 47156601382eb1350d51327bc597a22c0fe20c2f
parent 0d415e393c40d0aa5921288527b9d705cf0e1402
author Florian Thienel <florian@thienel.org> 1416736623 +0100
committer Florian Thienel <florian@thienel.org> 1416736623 +0100

Merge tag '1_1_0_RC1' into master_juno

Conflicts:
	org.eclipse.vex.releng/Build All Vex.launch
	org.eclipse.vex.releng/vex.target

Change-Id: I36f363a6ce9e7b5e79e5df1fe71f83507b632c27