deps: upgrade to npm 2.13.0

PR-URL: https://github.com/nodejs/io.js/pull/2152
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

3 files changed, 14 insertions, 12 deletions

diff --git a/deps/npm/node_modules/glob/README.md b/deps/npm/node_modules/glob/README.md
index fa993dcb6d..063cf950ac 100644
--- a/deps/npm/node_modules/glob/README.md
+++ b/deps/npm/node_modules/glob/README.md
@@ -262,7 +262,6 @@ the filesystem.
 * `matchBase` Perform a basename-only match if the pattern does not
   contain any slash characters.  That is, `*.js` would be treated as
   equivalent to `**/*.js`, matching all js files in all directories.
-* `nonull` Return the pattern when no matches are found.
 * `nodir` Do not match directories, only files.  (Note: to match
   *only* directories, simply put a `/` at the end of the pattern.)
 * `ignore` Add a pattern or an array of patterns to exclude matches.
diff --git a/deps/npm/node_modules/glob/glob.js b/deps/npm/node_modules/glob/glob.js
index d8ac4eff62..b343a71926 100644
--- a/deps/npm/node_modules/glob/glob.js
+++ b/deps/npm/node_modules/glob/glob.js
@@ -57,6 +57,7 @@ var ownProp = common.ownProp
 var inflight = require('inflight')
 var util = require('util')
 var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
 var once = require('once')
 
@@ -432,6 +433,9 @@ Glob.prototype._emitMatch = function (index, e) {
   if (this.matches[index][e])
     return
 
+  if (isIgnored(this, e))
+    return
+
   if (this.paused) {
     this._emitQueue.push([index, e])
     return
diff --git a/deps/npm/node_modules/glob/package.json b/deps/npm/node_modules/glob/package.json
index a0538e9558..e4627c730f 100644
--- a/deps/npm/node_modules/glob/package.json
+++ b/deps/npm/node_modules/glob/package.json
@@ -6,7 +6,7 @@
   },
   "name": "glob",
   "description": "a little globber",
-  "version": "5.0.10",
+  "version": "5.0.13",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -43,23 +43,23 @@
     "benchclean": "bash benchclean.sh"
   },
   "license": "ISC",
-  "gitHead": "e3cdccc0e295c2e1d5f40cf74c73ea17a8319c5c",
+  "gitHead": "507733d3c97f073ac676f58f2b6f2fe4c00f3e1c",
   "bugs": {
     "url": "https://github.com/isaacs/node-glob/issues"
   },
   "homepage": "https://github.com/isaacs/node-glob#readme",
-  "_id": "glob@5.0.10",
-  "_shasum": "3ee350319f31f352cef6899a48f6b6b7834c6899",
-  "_from": "glob@>=5.0.10 <5.1.0",
-  "_npmVersion": "2.10.1",
-  "_nodeVersion": "2.0.1",
+  "_id": "glob@5.0.13",
+  "_shasum": "0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f",
+  "_from": "glob@latest",
+  "_npmVersion": "3.0.0",
+  "_nodeVersion": "2.2.1",
   "_npmUser": {
     "name": "isaacs",
     "email": "isaacs@npmjs.com"
   },
   "dist": {
-    "shasum": "3ee350319f31f352cef6899a48f6b6b7834c6899",
-    "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.10.tgz"
+    "shasum": "0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f",
+    "tarball": "http://registry.npmjs.org/glob/-/glob-5.0.13.tgz"
   },
   "maintainers": [
     {
@@ -68,6 +68,5 @@
     }
   ],
   "directories": {},
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.10.tgz",
-  "readme": "ERROR: No README data found!"
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.13.tgz"
 }