Merge pull request #3750 from marek-safar/socket

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

Wed, 12 Oct 2016 08:09:18 +0000 (10:09 +0200)

committer GitHub <noreply@github.com>

Wed, 12 Oct 2016 08:09:18 +0000 (10:09 +0200)
author Marek Safar <marek.safar@gmail.com>
Wed, 12 Oct 2016 08:09:18 +0000 (10:09 +0200)
committer GitHub <noreply@github.com>
Wed, 12 Oct 2016 08:09:18 +0000 (10:09 +0200)
diff --cc mcs/class/corlib/System/Environment.cs
Simple merge
diff --cc mono/metadata/appdomain.c
Simple merge
diff --cc mono/metadata/icall-def.h
Simple merge
author	Marek Safar <marek.safar@gmail.com>
	Wed, 12 Oct 2016 08:09:18 +0000 (10:09 +0200)
committer	GitHub <noreply@github.com>
	Wed, 12 Oct 2016 08:09:18 +0000 (10:09 +0200)
		1	2
mcs/class/corlib/System/Environment.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/appdomain.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/icall-def.h	patch \|	diff1 \|	diff2 \|	blob \| history