Merge branch 'master' into traceur

Conflicts:
	package.json

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Gaps between patch versions are faulty/broken releases.
 
+## 2.5.0
+
+ * Remove `noDuplicateProperties` transformer.
+ * Better generated UIDs based on nodes.
+ * Default parameters now use `arguments[i]`, conditionals and variable declarations instead of using long-form if statements.
+
 ## 2.4.10
 
  * Upgrade `acorn-6to5`.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.4.10",
+  "version": "2.5.0",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -39,7 +39,7 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-6to5": "0.11.1-8",
+    "acorn-6to5": "0.11.1-10",
     "ast-types": "~0.6.1",
     "chokidar": "0.11.1",
     "commander": "2.5.0",

test/fixtures/transformation/spec-no-duplicate-properties/identifiers/actual.js

@@ -1 +0,0 @@
-var obj = { a: 1, a: 2 };

test/fixtures/transformation/spec-no-duplicate-properties/literals/actual.js

@@ -1 +0,0 @@
-var obj = { "a": 1, "a": 2 };

test/fixtures/transformation/spec-no-duplicate-properties/mixed/actual.js

@@ -1 +0,0 @@
-var obj = { a: 1, "a": 2 };

test/fixtures/transformation/spec-no-duplicate-properties/options.json

@@ -1,3 +0,0 @@
-{
-  "throws": "Duplicate property key"
-}