Strange behaviour. Maybe encoding?
Merge branch 'master' of ssh://git@github.com/semanticsoft/vaaclipse.git

Conflicts:
	org.semanticsoft.vaaclipse.resources/.classpath