Mohamed Hegazy cb012e01fd Merge branch 'master' into es6ImportExportEmit
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-03-16 20:47:08 -07:00
..