Anders
Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff

Conflicts:
	git5/git5/git5.csproj
Merge branch 'master' of https://github.com/Dingi/GitMergeTestStuff