2 commits

Author	SHA1	Message	Date
Cyrus Najmabadi	87b06f4c3f	Merge branch 'master' into symbolWriter2 ... Conflicts: tests/baselines/reference/APISample_compile.types tests/baselines/reference/APISample_linter.types tests/baselines/reference/APISample_transform.types tests/baselines/reference/APISample_watcher.types	2015-04-15 17:01:36 -07:00
Jason Freeman	1d8fb49f4c	Source type parameter extending union works even when target is a type parameter	2015-04-15 11:49:06 -07:00