Merge pull request #1989 from esdrubal/local_tz_from_link

author Rodrigo Kumpera <kumpera@gmail.com>

Mon, 24 Aug 2015 16:03:44 +0000 (12:03 -0400)

committer Rodrigo Kumpera <kumpera@gmail.com>

Mon, 24 Aug 2015 16:03:44 +0000 (12:03 -0400)
author Rodrigo Kumpera <kumpera@gmail.com>
Mon, 24 Aug 2015 16:03:44 +0000 (12:03 -0400)
committer Rodrigo Kumpera <kumpera@gmail.com>
Mon, 24 Aug 2015 16:03:44 +0000 (12:03 -0400)
diff --cc mcs/class/corlib/System/TimeZoneInfo.cs
Simple merge
diff --cc mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
Simple merge
author	Rodrigo Kumpera <kumpera@gmail.com>
	Mon, 24 Aug 2015 16:03:44 +0000 (12:03 -0400)
committer	Rodrigo Kumpera <kumpera@gmail.com>
	Mon, 24 Aug 2015 16:03:44 +0000 (12:03 -0400)
		1	2
mcs/class/corlib/System/TimeZoneInfo.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mcs/class/corlib/Test/System/TimeZoneInfoTest.cs	patch \|	diff1 \|	diff2 \|	blob \| history