npm: Upgrade to v1.3.15

4 files changed, 20 insertions, 3 deletions

diff --git a/deps/npm/node_modules/glob/glob.js b/deps/npm/node_modules/glob/glob.js
index 176be02f4..7903be18f 100644
--- a/deps/npm/node_modules/glob/glob.js
+++ b/deps/npm/node_modules/glob/glob.js
@@ -84,6 +84,11 @@ function Glob (pattern, options, cb) {
     return new Glob(pattern, options, cb)
   }
 
+  if (typeof options === "function") {
+    cb = options
+    options = null
+  }
+
   if (typeof cb === "function") {
     this.on("error", cb)
     this.on("end", function (matches) {
diff --git a/deps/npm/node_modules/glob/package.json b/deps/npm/node_modules/glob/package.json
index 73aa885e7..3ae510111 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": "3.2.6",
+  "version": "3.2.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -33,6 +33,7 @@
   "bugs": {
     "url": "https://github.com/isaacs/node-glob/issues"
   },
-  "_id": "glob@3.2.6",
-  "_from": "glob@latest"
+  "homepage": "https://github.com/isaacs/node-glob",
+  "_id": "glob@3.2.7",
+  "_from": "glob@~3.2.6"
 }
diff --git a/deps/npm/node_modules/glob/test/bash-results.json b/deps/npm/node_modules/glob/test/bash-results.json
index 3ffadba68..593215cd9 100644
--- a/deps/npm/node_modules/glob/test/bash-results.json
+++ b/deps/npm/node_modules/glob/test/bash-results.json
@@ -295,6 +295,7 @@
     "./test/cwd-test.js",
     "./test/globstar-match.js",
     "./test/mark.js",
+    "./test/new-glob-optional-options.js",
     "./test/nocase-nomagic.js",
     "./test/pause-resume.js",
     "./test/root-nomount.js",
diff --git a/deps/npm/node_modules/glob/test/new-glob-optional-options.js b/deps/npm/node_modules/glob/test/new-glob-optional-options.js
new file mode 100644
index 000000000..3e7dc5acb
--- /dev/null
+++ b/deps/npm/node_modules/glob/test/new-glob-optional-options.js
@@ -0,0 +1,10 @@
+var Glob = require('../glob.js').Glob;
+var test = require('tap').test;
+
+test('new glob, with cb, and no options', function (t) {
+  new Glob(__filename, function(er, results) {
+    if (er) throw er;
+    t.same(results, [__filename]);
+    t.end();
+  });
+});