Jason Freeman a94e61bfcd Merge branch 'master' of https://github.com/Microsoft/TypeScript into esSymbols
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
2015-02-10 16:20:32 -08:00
..