Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mailmap updates #1069

Merged
merged 4 commits into from Jan 10, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion .mailmap
Expand Up @@ -65,7 +65,7 @@ Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
Joe Buck <jbbuck@gmail.com> <buck@soe.ucsc.edu>
Laszlo Boszormenyi <gcs@debian.hu> Laszlo Boszormenyi (GCS) <gcs@debian.hu>
Roald J. van Loon <roaldvanloon@gmail.com> Roald van Loon <roaldvanloon@gmail.com>
Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
Alex Elder <elder@inktank.com> <elder@dreamhost.com>
Alex Elder <elder@inktank.com> <elder@doink.(none)>
Alex Elder <elder@inktank.com> <elder@speedy.(none)>
Expand Down Expand Up @@ -99,3 +99,8 @@ Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gm
Loic Dachary <loic@dachary.org> <loic@dachary.com>
Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Networks B.V <pascal@unilogicnetworks.net>