merge

Merge remote-tracking branch 'refs/remotes/tfs/default' into GitRelease10

Merge remote-tracking branch 'refs/remotes/tfs/default' into GitRelease10

aaa

Merge remote-tracking branch 'refs/remotes/tfs/default' into GitRelease10

Conflicts:
	TestSolution/Class3.cs

Merge branch 'GitRelease10' of github.com:EShalagin/TestTFSGit into GitRelease10

merge

git-tfs-id: [http://spb8590:8080/tfs/defaultcollection]$/TestProject/Branches/Release10;C118
9999999999

git-tfs-id: [http://spb8590:8080/tfs/defaultcollection]$/TestProject/src/TestSolution;C119
Merge $/TestProject/src/TestSolution into $/TestProject/Branches/Release10

git-tfs-id: [http://spb8590:8080/tfs/defaultcollection]$/TestProject/Branches/Release10;C120
Merge branch 'GitRelease10' of github.com:EShalagin/TestTFSGit into GitRelease10
Merge remote-tracking branch 'refs/remotes/tfs/GitRelease10' into GitRelease10