Merge pull request #1299 from esdrubal/uriuserinfo

author Rodrigo Kumpera <kumpera@gmail.com>

Tue, 23 Sep 2014 18:00:13 +0000 (14:00 -0400)

committer Rodrigo Kumpera <kumpera@gmail.com>

Tue, 23 Sep 2014 18:00:13 +0000 (14:00 -0400)
author Rodrigo Kumpera <kumpera@gmail.com>
Tue, 23 Sep 2014 18:00:13 +0000 (14:00 -0400)
committer Rodrigo Kumpera <kumpera@gmail.com>
Tue, 23 Sep 2014 18:00:13 +0000 (14:00 -0400)
diff --cc mcs/class/System/System/UriParseComponents.cs
Simple merge
diff --cc mcs/class/System/Test/System/UriTest.cs
Simple merge
author	Rodrigo Kumpera <kumpera@gmail.com>
	Tue, 23 Sep 2014 18:00:13 +0000 (14:00 -0400)
committer	Rodrigo Kumpera <kumpera@gmail.com>
	Tue, 23 Sep 2014 18:00:13 +0000 (14:00 -0400)
		1	2
mcs/class/System/System/UriParseComponents.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mcs/class/System/Test/System/UriTest.cs	patch \|	diff1 \|	diff2 \|	blob \| history