remove end
Merge remote-tracking branch 'remotes/origin/v2-file' into v2-stable

Conflicts:
	v2.txt
hotfic: abc added
Merge remote-tracking branch 'remotes/origin/v2-stable' into v2-file
added help
Merge remote-tracking branch 'remotes/origin/v2-file' into v2-stable
Merge remote-tracking branch 'remotes/origin/v2-stable'