Jason Freeman b022ccd430 Merge branch 'master' into computedProperties
Conflicts:
	src/compiler/checker.ts
2015-01-21 11:03:24 -08:00
..