Signed-off-by: Martin Lange <mail@martinlange.eu>
Merge branch 'master' of https://github.com/m-lange/eclipse.git

Conflicts:
	org.mlange.launch/plugin.xml