Lars Kappert a37f2093bc Merge branch 'master' of github.com:6to5/6to5 into amd-module-id ...

Conflicts:
	lib/6to5/file.js
	lib/6to5/transformation/modules/umd.js

2014-11-19 08:39:02 +01:00

..

6to5

Merge branch 'master' of github.com:6to5/6to5 into amd-module-id

2014-11-19 08:39:02 +01:00