Jason Freeman 22e989795d Merge branch 'master' into sigHelp
Conflicts:
	src/compiler/checker.ts
	src/compiler/types.ts
	src/services/services.ts
2014-09-24 10:47:41 -07:00
..