Cyrus Najmabadi 9aee22b943 Merge branch 'master' into newLanguageService
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
	src/harness/fourslash.ts
	src/harness/harness.ts
	src/harness/harnessLanguageService.ts
	src/harness/rwcRunner.ts
	src/services/services.ts
2014-08-22 14:23:14 -07:00
..
2014-08-08 16:45:10 -07:00