summaryrefslogtreecommitdiff
path: root/deps/npm/.mailmap
diff options
context:
space:
mode:
authorForrest L Norvell <forrest@npmjs.com>2015-03-20 01:40:50 -0700
committerChris Dickinson <christopher.s.dickinson@gmail.com>2015-03-23 16:31:02 -0700
commitb542fb94a4acb7bdcb3ba66fbbdd95465fa633f8 (patch)
tree45d7296e0799cdff86c1e2700fa97d5b29eec33c /deps/npm/.mailmap
parent2e5b87a147f0bb1e92de4a62f392bb4f3ac12f8f (diff)
downloadandroid-node-v8-b542fb94a4acb7bdcb3ba66fbbdd95465fa633f8.tar.gz
android-node-v8-b542fb94a4acb7bdcb3ba66fbbdd95465fa633f8.tar.bz2
android-node-v8-b542fb94a4acb7bdcb3ba66fbbdd95465fa633f8.zip
deps: upgrade npm to 2.7.3
PR-URL: https://github.com/iojs/io.js/pull/1219 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/npm/.mailmap')
-rw-r--r--deps/npm/.mailmap8
1 files changed, 5 insertions, 3 deletions
diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
index c90d447486..5b346e1678 100644
--- a/deps/npm/.mailmap
+++ b/deps/npm/.mailmap
@@ -8,13 +8,15 @@ Dalmais Maxence <root@ip-10-195-202-5.ec2.internal>
David Beitey <david@davidjb.com>
Domenic Denicola <domenic@domenicdenicola.com>
Einar Otto Stangvik <einaros@gmail.com>
-Evan Lucas <evan@btc.com> <evanlucas@me.com> <evan.lucas@hattiesburgclinic.com>
+Evan Lucas <evan@btc.com> <evanlucas@me.com>
+Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
Faiq Raza <faiqrazarizvi@gmail.com>
Forbes Lindesay <forbes@lindesay.co.uk>
-Forrest L. Norvell <forrest@npmjs.com> <ogd@aoaioxxysz.net>
+Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
Gabriel Barros <descartavel1@gmail.com>
Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
+Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
Jake Verbaten <raynos2@gmail.com>
James Sanders <jimmyjazz14@gmail.com>
Jason Smith <jhs@iriscouch.com>
@@ -28,4 +30,4 @@ Nicolas Morel <marsup@gmail.com>
Olivier Melcher <olivier.melcher@gmail.com>
Visnu Pitiyanuvath <visnupx@gmail.com>
Will Elwood <w.elwood08@gmail.com>
-Zeke Sikelianos <zeke@sikelianos.com> \ No newline at end of file
+Zeke Sikelianos <zeke@sikelianos.com>