Cyrus Najmabadi a228cb568c Merge branch 'master' into multiLineEmit2
Conflicts:
	tests/baselines/reference/computedPropertyNames11_ES5.js
	tests/baselines/reference/computedPropertyNames1_ES5.js
	tests/baselines/reference/computedPropertyNamesContextualType1_ES5.js
	tests/baselines/reference/computedPropertyNamesContextualType2_ES5.js
	tests/baselines/reference/computedPropertyNamesContextualType3_ES5.js
	tests/baselines/reference/computedPropertyNamesDeclarationEmit5_ES5.js
2015-02-21 15:00:23 -08:00
..