Merge branch 'master' into windows-updates

seanmwalker · seanmwalker · commit 45623a67fd80 · 2014-01-21T19:57:45.000-06:00
Conflicts:
	spec/acceptance/test_spec.js
diff --git a/package.json b/package.json
@@ -14,11 +14,12 @@
   , "colors": "0.6.0-1"
   , "async": "0.2.9"
   , "rolling_timeout_exec": ">=0.0.1"
-  , "which": ">=1.0.5"
+  , "which": ">=1.5.5"
   }
 , "devDependencies":
   { "mocha": ">=1.2.2"
   , "connect": ">=2.3.6"
+  , "which": ">=1.5.5"
   }
 , "scripts":
   { "test": "mocha spec/unit spec/acceptance -t 240000 -R spec"

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,12 @@`
`14`	`14`	`, "colors": "0.6.0-1"`
`15`	`15`	`, "async": "0.2.9"`
`16`	`16`	`, "rolling_timeout_exec": ">=0.0.1"`
`17`		`- , "which": ">=1.0.5"`
	`17`	`+ , "which": ">=1.5.5"`
`18`	`18`	`}`
`19`	`19`	`, "devDependencies":`
`20`	`20`	`{ "mocha": ">=1.2.2"`
`21`	`21`	`, "connect": ">=2.3.6"`
	`22`	`+ , "which": ">=1.5.5"`
`22`	`23`	`}`
`23`	`24`	`, "scripts":`
`24`	`25`	`{ "test": "mocha spec/unit spec/acceptance -t 240000 -R spec"`