Merge pull request #3786 from lambdageek/dev-42584-take2

author Aleksey Kliger (λgeek) <akliger@gmail.com>

Thu, 20 Oct 2016 15:33:15 +0000 (11:33 -0400)

committer GitHub <noreply@github.com>

Thu, 20 Oct 2016 15:33:15 +0000 (11:33 -0400)
author Aleksey Kliger (λgeek) <akliger@gmail.com>
Thu, 20 Oct 2016 15:33:15 +0000 (11:33 -0400)
committer GitHub <noreply@github.com>
Thu, 20 Oct 2016 15:33:15 +0000 (11:33 -0400)
diff --cc mono/metadata/class.c
Simple merge
diff --cc mono/tests/Makefile.am
Simple merge
author	Aleksey Kliger (λgeek) <akliger@gmail.com>
	Thu, 20 Oct 2016 15:33:15 +0000 (11:33 -0400)
committer	GitHub <noreply@github.com>
	Thu, 20 Oct 2016 15:33:15 +0000 (11:33 -0400)
		1	2
mono/metadata/class.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history