Merge pull request #799 from kebby/master

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

Tue, 12 Nov 2013 08:38:48 +0000 (00:38 -0800)

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

Tue, 12 Nov 2013 08:38:48 +0000 (00:38 -0800)
author Marek Safar <marek.safar@gmail.com>
Tue, 12 Nov 2013 08:38:48 +0000 (00:38 -0800)
committer Marek Safar <marek.safar@gmail.com>
Tue, 12 Nov 2013 08:38:48 +0000 (00:38 -0800)
diff --cc mcs/class/corlib/System.Threading.Tasks/Task.cs
Simple merge
diff --cc mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
Simple merge
author	Marek Safar <marek.safar@gmail.com>
	Tue, 12 Nov 2013 08:38:48 +0000 (00:38 -0800)
committer	Marek Safar <marek.safar@gmail.com>
	Tue, 12 Nov 2013 08:38:48 +0000 (00:38 -0800)
		1	2
mcs/class/corlib/System.Threading.Tasks/Task.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs	patch \|	diff1 \|	diff2 \|	blob \| history