Richard Knoll 084b94c4c1 Merge branch 'master' into glob2
Conflicts:
	Jakefile.js
	src/compiler/commandLineParser.ts
	src/compiler/core.ts
	src/compiler/sys.ts
	src/harness/harness.ts
	src/server/editorServices.ts
	src/services/shims.ts
	tests/cases/unittests/cachingInServerLSHost.ts
2016-05-25 17:06:50 -07:00
..
2016-05-25 17:06:50 -07:00