Merge branch 'master' into code-generator

Conflicts: package.json
2014-10-30 13:29:05 +11:00
parent e5ae2f8eaf ecedc23892
commit 1a3d306949
6 changed files with 19 additions and 16 deletions
--- a/lib/6to5/transformers/_alias-functions.js
+++ b/lib/6to5/transformers/_alias-functions.js
@@ -15,7 +15,7 @@ var go = function (getBody, node, file) {
  };

  // traverse the function and find all alias functions so we can alias
-  // arguments and this if neccesary
+  // arguments and this if necessary
  traverse(node, function (node) {
    var _aliasFunction = node._aliasFunction;
    if (!_aliasFunction) {