Sebastian McKenzie f3d371869d Merge branch 'master' into code-generator ...

Conflicts:
	lib/6to5/register.js

2014-11-03 12:22:07 +11:00

..

6to5

Merge branch 'master' into code-generator

2014-11-03 12:22:07 +11:00