Mohamed Hegazy 696b688987 Merge branch 'master' into exportDefaultType
Conflicts:
	src/compiler/diagnosticInformationMap.generated.ts
	src/compiler/diagnosticMessages.json
2015-03-16 14:42:47 -07:00
..