Lars Kappert 50e5bd4680 Merge remote-tracking branch 'origin/master' into amd-port-interop
Conflicts:
	test/fixtures/transformation/es6-modules-amd/exports-default/expected.js
	test/fixtures/transformation/es6-modules-amd/overview/expected.js
	test/fixtures/transformation/es6-modules-umd/exports-default/expected.js
	test/fixtures/transformation/es6-modules-umd/overview/expected.js
2015-01-06 20:21:00 +01:00
..
2015-01-04 13:42:16 +11:00
2014-12-27 17:00:46 +11:00
2015-01-06 10:39:56 +11:00
2014-12-27 21:22:34 +11:00
2015-01-05 16:43:00 +08:00