Merge pull request #2500 from ludovic-henry/monoerror-mono_string_alloc

author Rodrigo Kumpera <kumpera@gmail.com>

Tue, 26 Jan 2016 20:15:12 +0000 (15:15 -0500)

committer Rodrigo Kumpera <kumpera@gmail.com>

Tue, 26 Jan 2016 20:15:12 +0000 (15:15 -0500)
author Rodrigo Kumpera <kumpera@gmail.com>
Tue, 26 Jan 2016 20:15:12 +0000 (15:15 -0500)
committer Rodrigo Kumpera <kumpera@gmail.com>
Tue, 26 Jan 2016 20:15:12 +0000 (15:15 -0500)
diff --cc mono/metadata/object.c
Simple merge
diff --cc mono/metadata/sgen-mono.c
Simple merge
author	Rodrigo Kumpera <kumpera@gmail.com>
	Tue, 26 Jan 2016 20:15:12 +0000 (15:15 -0500)
committer	Rodrigo Kumpera <kumpera@gmail.com>
	Tue, 26 Jan 2016 20:15:12 +0000 (15:15 -0500)
		1	2
mono/metadata/object.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/sgen-mono.c	patch \|	diff1 \|	diff2 \|	blob \| history