Sebastian McKenzie 89a3206553 Merge branch 'master' into 3.0.0 ...

Conflicts:
	CHANGELOG.md
	lib/6to5/transformation/transformers/optional-core-aliasing.js

2015-01-24 15:00:44 +11:00

..

async-to-generator.js

better categorisation of transformers

2015-01-23 23:02:40 +11:00

bluebird-coroutines.js

better categorisation of transformers

2015-01-23 23:02:40 +11:00

self-contained.js

Merge branch 'master' into 3.0.0

2015-01-24 15:00:44 +11:00