Merge branch 'master' into 3.0.0

Conflicts:
	CHANGELOG.md
	lib/6to5/transformation/transformers/optional-core-aliasing.js
This commit is contained in:
Sebastian McKenzie
2015-01-24 15:00:44 +11:00
4 changed files with 12 additions and 2 deletions