Sebastian McKenzie 7257e2445d Merge branch 'master' into 3.0.0
Conflicts:
	CHANGELOG.md
	lib/6to5/file.js
	lib/6to5/register.js
2015-01-20 00:36:06 +11:00
..
2015-01-20 00:36:06 +11:00
2014-09-28 23:39:22 +10:00