Mohamed Hegazy d3e70ecfbf Merge branch 'master' into es6typings
Conflicts:
	src/compiler/parser.ts
	src/compiler/tsc.ts
	src/harness/harness.ts
	src/harness/projectsRunner.ts
	tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.errors.txt
2014-11-27 09:59:46 -08:00
..