deps: upgrade npm to 3.6.0

LICENSE

@@ -672,14 +672,32 @@ The externally maintained libraries used by Node.js are:
 
 - npm, located at deps/npm, is licensed as follows:
   """
+    The npm application
     Copyright (c) npm, Inc. and Contributors
-    All rights reserved.
+    Licensed on the terms of The Artistic License 2.0
+
+    Node package dependencies of the npm application
+    Copyright (c) their respective copyright owners
+    Licensed on their respective license terms
+
+    The npm public registry at https://registry.npmjs.org
+    and the npm website at https://www.npmjs.com
+    Operated by npm, Inc.
+    Use governed by terms published on https://www.npmjs.com
+
+    "Node.js"
+    Trademark Joyent, Inc., https://joyent.com
+    Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
 
-    npm is released under the Artistic License 2.0, subject to additional terms
-    that are listed below.
+    The Node.js application
+    Project of Node Foundation, https://nodejs.org
 
-    The text of the npm License follows and the text of the additional terms
-    follows the Artistic License 2.0 terms:
+    The npm Logo
+    Copyright (c) Mathias Pettersson and Brian Hammond
+
+    "Gubblebum Blocky" typeface
+    Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
+    Used with permission
 
     --------
 
@@ -879,51 +897,6 @@ The externally maintained libraries used by Node.js are:
     ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     --------
-
-    The following additional terms shall apply to use of the npm software, the npm
-    website, the npm repository and any other services or products offered by npm,
-    Inc.:
-
-    "Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
-    project, and is neither owned by nor affiliated with Joyent, Inc.
-
-    "npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
-
-    Modules published on the npm registry are not officially endorsed by npm, Inc.
-    or the Node.js project.
-
-    Data published to the npm registry is not part of npm itself, and is the sole
-    property of the publisher. While every effort is made to ensure accountability,
-    there is absolutely no guarantee, warrantee, or assertion expressed or implied
-    as to the quality, fitness for a specific purpose, or lack of malice in any
-    given npm package.  Packages downloaded through the npm registry are
-    independently licensed and are not covered by this license.
-
-    Additional policies relating to, and restrictions on use of, npm products and
-    services are available on the npm website.  All such policies and restrictions,
-    as updated from time to time, are hereby incorporated into this license
-    agreement.  By using npm, you acknowledge your agreement to all such policies
-    and restrictions.
-
-    If you have a complaint about a package in the public npm registry, and cannot
-    resolve it with the package owner, please email [email protected] and explain
-    the situation.  See the [npm Dispute Resolution
-    policy](https://github.com/npm/policies/blob/master/disputes.md) for more
-    details.
-
-    Any data published to The npm Registry (including user account information) may
-    be removed or modified at the sole discretion of the npm server administrators.
-
-    "npm Logo" contributed by Mathias Pettersson and Brian Hammond,
-    use is subject to https://www.npmjs.com/policies/trademark
-
-    "Gubblebum Blocky" font
-    Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
-    included for use in the npm website and documentation,
-    used with permission.
-
-    This program uses several Node modules contained in the node_modules/
-    subdirectory, according to the terms of their respective licenses.
   """
 
 - GYP, located at tools/gyp, is licensed as follows:

deps/npm/.mailmap

@@ -2,6 +2,8 @@ Alex K. Wolfe <[email protected]>
 Andrew Bradley <[email protected]>
 Andrew Lunny <[email protected]>
 Arlo Breault <[email protected]>
+Ashley Williams <[email protected]> <[email protected]>
+Ashley Williams <[email protected]> <[email protected]>
 Benjamin Coe <[email protected]>
 Benjamin Coe <[email protected]> <[email protected]>
 Brian White <[email protected]> <[email protected]>
@@ -28,10 +30,12 @@ James Treworgy <[email protected]>
 Jason Smith <[email protected]>
 Jonas Weber <[email protected]>
 Julien Meddah <[email protected]>
+Kevin Lorenz <[email protected]>
 Kris Windham <[email protected]>
 Lin Clark <[email protected]>
 Luke Arduini <[email protected]> <[email protected]>
 Maciej Małecki <[email protected]> <[email protected]>
+Martin Ek <[email protected]>
 Max Goodman <[email protected]>
 Maxim Bogushevich <[email protected]>
 Maximilian Antoni <[email protected]> <[email protected]>

deps/npm/.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "4.1"
-  - "4.0"
+  - "5"
+  - "4"
   - iojs
   - "0.12"
   - "0.10"

deps/npm/AUTHORS

@@ -324,3 +324,31 @@ Jason Kurian <[email protected]>
 Sebastiaan Deckers <[email protected]>
 lady3bean <[email protected]>
 Tomi Carr <[email protected]>
+Juan Caicedo <[email protected]>
+Ashley Williams <[email protected]>
+Andrew Marcinkevičius <[email protected]>
+Jorrit Schippers <[email protected]>
+Alex Lukin <[email protected]>
+Aria Stewart <[email protected]>
+Tiago Rodrigues <[email protected]>
+Tim <[email protected]>
+Nick Williams <[email protected]>
+Louis Larry <[email protected]>
+Ben Gotow <[email protected]>
+Jakub Gieryluk <[email protected]>
+Kevin Lorenz <[email protected]>
+Martin von Gagern <[email protected]>
+Eymen Gunay <[email protected]>
+Martin Ek <[email protected]>
+Rafał Pocztarski <[email protected]>
+Mark Reeder <[email protected]>
+Chris Rebert <[email protected]>
+Scott Addie <[email protected]>
+Jeff McMahan <[email protected]>
+Tim Krins <[email protected]>
+Hal Henke <[email protected]>
+Julian Simioni <[email protected]>
+Jimb Esser <[email protected]>
+Alexis Campailla <[email protected]>
+Chris Chua <[email protected]>
+Beau Gunderson <[email protected]>