Merge branch 'master' into dev

indutny · Oct 29, 2011 · c1df68c · c1df68c
2 parents 3abe84e + e666f74
commit c1df68c
Show file tree

Hide file tree

Showing 17 changed files with 725 additions and 343 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ stamp-build
 *~
 gmon.out
 v8.log
+node_modules
diff --git a/bin/nodeunit b/bin/nodeunit
@@ -11,7 +11,7 @@ var
 require('../deps/console.log');
 
 //require.paths.push(process.cwd());
-var args = process.ARGV.slice(2);
+var args = (process.ARGV || process.argv).slice(2);
 
 var files = [];
 

diff --git a/deps/json2.js b/deps/json2.js
@@ -159,9 +159,7 @@
 // Create a JSON object only if one does not already exist. We create the
 // methods in a closure to avoid creating global variables.
 
-if (!this.JSON) {
-    this.JSON = {};
-}
+var JSON = {};
 
 (function () {
     "use strict";