Anders Hejlsberg 87d43aa6f5 Merge branch 'master' into circularInstantiatedTypes
Conflicts:
	src/compiler/checker.ts
	src/compiler/types.ts
2015-06-03 14:13:16 -07:00
..