Merge pull request #4615 from alexanderkyte/string_error_handling

author Alexander Kyte <alexmkyte@gmail.com>

Wed, 12 Apr 2017 19:47:39 +0000 (15:47 -0400)

committer GitHub <noreply@github.com>

Wed, 12 Apr 2017 19:47:39 +0000 (15:47 -0400)
author Alexander Kyte <alexmkyte@gmail.com>
Wed, 12 Apr 2017 19:47:39 +0000 (15:47 -0400)
committer GitHub <noreply@github.com>
Wed, 12 Apr 2017 19:47:39 +0000 (15:47 -0400)
diff --cc mono/metadata/icall.c
Simple merge
diff --cc mono/metadata/object.c
Simple merge
author	Alexander Kyte <alexmkyte@gmail.com>
	Wed, 12 Apr 2017 19:47:39 +0000 (15:47 -0400)
committer	GitHub <noreply@github.com>
	Wed, 12 Apr 2017 19:47:39 +0000 (15:47 -0400)
		1	2
mono/metadata/icall.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/metadata/object.c	patch \|	diff1 \|	diff2 \|	blob \| history