Daniel Rosenwasser 38b605ea7d Merge branch 'release-1.6'
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/compiler/program.ts
	tests/baselines/reference/emptyObjectBindingPatternParameter04.symbols
	tests/baselines/reference/emptyObjectBindingPatternParameter04.types
	tests/baselines/reference/nodeResolution5.errors.txt
	tests/baselines/reference/nodeResolution7.errors.txt
2015-09-15 13:36:08 -07:00
..
2015-09-15 13:36:08 -07:00
2015-09-15 13:36:08 -07:00
2015-09-15 13:36:08 -07:00