Merge pull request #2686 from ludovic-henry/monoerror-mono_remoting_invoke

author monojenkins <jo.shields+jenkins@xamarin.com>

Tue, 1 Mar 2016 15:30:18 +0000 (15:30 +0000)

committer monojenkins <jo.shields+jenkins@xamarin.com>

Tue, 1 Mar 2016 15:30:18 +0000 (15:30 +0000)
author monojenkins <jo.shields+jenkins@xamarin.com>
Tue, 1 Mar 2016 15:30:18 +0000 (15:30 +0000)
committer monojenkins <jo.shields+jenkins@xamarin.com>
Tue, 1 Mar 2016 15:30:18 +0000 (15:30 +0000)
diff --cc mono/metadata/marshal.c
Simple merge
diff --cc mono/metadata/object-internals.h
Simple merge
diff --cc mono/metadata/object.c
Simple merge
author	monojenkins <jo.shields+jenkins@xamarin.com>
	Tue, 1 Mar 2016 15:30:18 +0000 (15:30 +0000)
committer	monojenkins <jo.shields+jenkins@xamarin.com>
	Tue, 1 Mar 2016 15:30:18 +0000 (15:30 +0000)
		1	2
mono/metadata/marshal.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/object-internals.h	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/object.c	patch \|	diff1 \|	diff2 \|	blob \| history