Jason Freeman ce9dc32704 Merge branch 'master' of https://github.com/Microsoft/TypeScript into generators
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-05-05 14:11:09 -07:00
..