Mohamed Hegazy dc0560ae59 Merge branch 'master' into getReferences
Conflicts:
	tests/baselines/reference/aliasUsageInGenericFunction.types
	tests/baselines/reference/aliasUsageInObjectLiteral.types
	tests/baselines/reference/aliasUsageInOrExpression.types
	tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
2014-08-29 15:56:36 -07:00
..