diff options
author | Vicent Martí <vicent@github.com> | 2013-04-21 05:48:08 -0700 |
---|---|---|
committer | Vicent Martí <vicent@github.com> | 2013-04-21 05:48:08 -0700 |
commit | 3a2a511be3ae225e5c5a3d38f65d672805ec99cd (patch) | |
tree | 1a0768f254e8f59052e745f482041d75895ea3e4 | |
parent | 8f24e65ff6f7573bc6778f5bbea7119fc9b7b626 (diff) | |
parent | 6b24688758b721afece65702475f76d225d096be (diff) | |
download | libgit2-3a2a511be3ae225e5c5a3d38f65d672805ec99cd.tar.gz |
Merge pull request #1494 from nulltoken/fix/mailmap
mailmap: Coalesce some identities
-rw-r--r-- | .mailmap | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -5,3 +5,14 @@ Ben Straub <bs@github.com> Ben Straub <ben@straubnet.net> Ben Straub <bs@github.com> Ben Straub <bstraub@github.com> Carlos Martín Nieto <cmn@dwim.me> <carlos@cmartin.tk> Carlos Martín Nieto <cmn@dwim.me> <cmn@elego.de> +nulltoken <emeric.fermas@gmail.com> <emeric.fermas@gmail.com> +Scott J. Goldman <scottjg@github.com> <scottjgo@gmail.com> +Martin Woodward <martin.woodward@microsoft.com> <martinwo@microsoft.com> +Peter Drahoš <drahosp@gmail.com> <drahosp@gmail.com> +Adam Roben <adam@github.com> <adam@roben.org> +Adam Roben <adam@github.com> <adam@github.com> +Xavier L. <xavier.l@afrosoft.tk> <xavier.l@afrosoft.ca> +Xavier L. <xavier.l@afrosoft.tk> <xavier.l@afrosoft.tk> +Sascha Cunz <sascha@babbelbox.org> <Sascha@BabbelBox.org> +Authmillenon <authmillenon@googlemail.com> <martin@ucsmail.de> +Authmillenon <authmillenon@googlemail.com> <authmillenon@googlemail.com> |