Anders Hejlsberg 285483d871 Merge branch 'master' into polymorphicThisType
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
2015-09-22 10:04:23 -07:00
..