Merge pull request #1508 from slluis/fix-20966

author Marek Safar <marek.safar@gmail.com>

Fri, 6 Feb 2015 10:05:40 +0000 (11:05 +0100)

committer Marek Safar <marek.safar@gmail.com>

Fri, 6 Feb 2015 10:05:40 +0000 (11:05 +0100)
author Marek Safar <marek.safar@gmail.com>
Fri, 6 Feb 2015 10:05:40 +0000 (11:05 +0100)
committer Marek Safar <marek.safar@gmail.com>
Fri, 6 Feb 2015 10:05:40 +0000 (11:05 +0100)
diff --cc mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
Simple merge
diff --cc mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
Simple merge
author	Marek Safar <marek.safar@gmail.com>
	Fri, 6 Feb 2015 10:05:40 +0000 (11:05 +0100)
committer	Marek Safar <marek.safar@gmail.com>
	Fri, 6 Feb 2015 10:05:40 +0000 (11:05 +0100)
		1	2
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj	patch \|	diff1 \|	diff2 \|	blob \| history