Merge pull request #2536 from lambdageek/monoerror-mono_field_get_object

author Rodrigo Kumpera <kumpera@gmail.com>

Tue, 2 Feb 2016 23:37:33 +0000 (18:37 -0500)

committer Rodrigo Kumpera <kumpera@gmail.com>

Tue, 2 Feb 2016 23:37:33 +0000 (18:37 -0500)
author Rodrigo Kumpera <kumpera@gmail.com>
Tue, 2 Feb 2016 23:37:33 +0000 (18:37 -0500)
committer Rodrigo Kumpera <kumpera@gmail.com>
Tue, 2 Feb 2016 23:37:33 +0000 (18:37 -0500)
diff --cc mono/metadata/icall.c
Simple merge
diff --cc mono/metadata/reflection.c
Simple merge
author	Rodrigo Kumpera <kumpera@gmail.com>
	Tue, 2 Feb 2016 23:37:33 +0000 (18:37 -0500)
committer	Rodrigo Kumpera <kumpera@gmail.com>
	Tue, 2 Feb 2016 23:37:33 +0000 (18:37 -0500)
		1	2
mono/metadata/icall.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/reflection.c	patch \|	diff1 \|	diff2 \|	blob \| history