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