more mailmap entries

1 files changed, 44 insertions, 39 deletions

diff --git a/.mailmap b/.mailmap
index 50564ba05..3b87c4913 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,54 +21,59 @@ Simon Green <mail@simon.green> Simon Green <sgreen+mozilla@redhat.com>
 Simon Green <mail@simon.green> Simon Green <simon@simongreen.net>
 Terry <terry@mozilla.org> terry%mozilla.org <>
 Terry <terry@mozilla.org> terry%netscape.com <>
+eseyman <eseyman@linagora.com> eseyman%linagora.com <>
+<koosha.khajeh@gmail.com> <Koosha>
+
+A. Shimono (himorin) <shimono@bug-ja.org> A. Shimono <shimono@bug-ja.org>
+A. Shimono (himorin) <shimono@bug-ja.org> A. Shimono [:himorin] <shimono@bug-ja.org>
+Teemu Mannermaa <wicked@sci.fi> wicked%sci.fi <>
 
-jocuri <jocuri@softhome.net> jocuri%softhome.net <>
-myk <myk@mozilla.org> myk%mozilla.org <>
-bugreport <bugreport@peshkin.net> bugreport%peshkin.net <>
-bbaetz <bbaetz@student.usyd.edu.au> bbaetz%student.usyd.edu.au <>
-timeless <timeless@mozdev.org> timeless%mozdev.org <>
-travis <travis@sedsystems.ca> travis%sedsystems.ca <>
-jake <jake@bugzilla.org> jake%bugzilla.org <>
-jake <jake@acutex.net> jake%acutex.net <>
-kiko <kiko@async.com.br> kiko%async.com.br <>
-cyeh <cyeh@bluemartini.com> cyeh%bluemartini.com <>
-mozilla <mozilla@colinogilvie.co.uk> mozilla%colinogilvie.co.uk <>
-vladd <vladd@bugzilla.org> vladd%bugzilla.org <>
-wurblzap <wurblzap@gmail.com> wurblzap%gmail.com <>
-dave <dave@intrec.com> dave%intrec.com <>
-zach <zach@zachlipton.com> zach%zachlipton.com <>
-endico <endico@mozilla.org> endico%mozilla.org <>
 bbaetz <bbaetz@acm.org> bbaetz%acm.org <>
-reed <reed@reedloden.com> reed%reedloden.com <>
+bbaetz <bbaetz@acm.org> bbaetz%cs.mcgill.ca <>
+bbaetz <bbaetz@acm.org> bbaetz%student.usyd.edu.au <>
+
 barnboy <barnboy@trilobyte.net> barnboy%trilobyte.net <>
-matty <matty@chariot.net.au> matty%chariot.net.au <>
-jouni <jouni@heikniemi.net> jouni%heikniemi.net <>
-tara <tara@tequilarista.org> tara%tequilarista.org <>
-olav <olav@bkor.dhs.org> olav%bkor.dhs.org <>
-dmose <dmose@mozilla.org> dmose%mozilla.org <>
-mbarnson <mbarnson@sisna.com> mbarnson%sisna.com <>
-guy.pyrzak <guy.pyrzak@gmail.com> guy.pyrzak%gmail.com <>
-ghendricks <ghendricks@novell.com> ghendricks%novell.com <>
-preed <preed@sigkill.com> preed%sigkill.com <>
+blakeross <blakeross@telocity.com> blakeross%telocity.com <>
 bryce-mozilla <bryce-mozilla@nextbus.com> bryce-mozilla%nextbus.com <>
-timeless <timeless@mac.com> timeless%mac.com <>
+bugreport <bugreport@peshkin.net> bugreport%peshkin.net <>
 burnus <burnus@gmx.de> burnus%gmx.de <>
-bbaetz <bbaetz@cs.mcgill.ca> bbaetz%cs.mcgill.ca <>
-karl <karl@kornel.name> karl%kornel.name <>
-wicked <wicked@sci.fi> wicked%sci.fi <>
-harrison <harrison@netscape.com> harrison%netscape.com <>
-seth <seth@cs.brandeis.edu> seth%cs.brandeis.edu <>
-eseyman <eseyman@linagora.com> eseyman%linagora.com <>
 caillon <caillon@returnzero.com> caillon%returnzero.com <>
+cyeh <cyeh@bluemartini.com> cyeh%bluemartini.com <>
+dave <dave@intrec.com> dave%intrec.com <>
+db48x <db48x@yahoo.com> db48x%yahoo.com <>
+dmose <dmose@mozilla.org> dmose%mozilla.org <>
 donm <donm@bluemartini.com> donm%bluemartini.com <>
-jkeiser <jkeiser@netscape.com> jkeiser%netscape.com <>
+endico <endico@mozilla.org> endico%mozilla.org <>
 erik <erik@dasbistro.com> erik%dasbistro.com <>
-mbarnson <mbarnson@excitehome.net> mbarnson%excitehome.net <>
-jwz <jwz@mozilla.org> jwz%mozilla.org <>
-john <john@johnkeiser.com> john%johnkeiser.com <>
-blakeross <blakeross@telocity.com> blakeross%telocity.com <>
-db48x <db48x@yahoo.com> db48x%yahoo.com <>
+ghendricks <ghendricks@novell.com> ghendricks%novell.com <>
+guy.pyrzak <guy.pyrzak@gmail.com> guy.pyrzak%gmail.com <>
+harrison <harrison@netscape.com> harrison%netscape.com <>
+jake <jake@acutex.net> jake%acutex.net <>
+jake <jake@bugzilla.org> jake%bugzilla.org <>
 jeff.hedlund <jeff.hedlund@matrixsi.com> jeff.hedlund%matrixsi.com <>
+jkeiser <jkeiser@netscape.com> jkeiser%netscape.com <>
+jocuri <jocuri@softhome.net> jocuri%softhome.net <>
+john <john@johnkeiser.com> john%johnkeiser.com <>
+jouni <jouni@heikniemi.net> jouni%heikniemi.net <>
+jwz <jwz@mozilla.org> jwz%mozilla.org <>
+karl <karl@kornel.name> karl%kornel.name <>
 karl.kornel <karl.kornel@mindspeed.com> karl.kornel%mindspeed.com <>
+kiko <kiko@async.com.br> kiko%async.com.br <>
+matty <matty@chariot.net.au> matty%chariot.net.au <>
+mbarnson <mbarnson@excitehome.net> mbarnson%excitehome.net <>
+mbarnson <mbarnson@sisna.com> mbarnson%sisna.com <>
 mcafee <mcafee@netscape.com> mcafee%netscape.com <>
+mozilla <mozilla@colinogilvie.co.uk> mozilla%colinogilvie.co.uk <>
+myk <myk@mozilla.org> myk%mozilla.org <>
+olav <olav@bkor.dhs.org> olav%bkor.dhs.org <>
+preed <preed@sigkill.com> preed%sigkill.com <>
+reed <reed@reedloden.com> reed%reedloden.com <>
+seth <seth@cs.brandeis.edu> seth%cs.brandeis.edu <>
 shaver <shaver@netscape.com> shaver%netscape.com <>
+tara <tara@tequilarista.org> tara%tequilarista.org <>
+timeless <timeless@mac.com> timeless%mac.com <>
+timeless <timeless@mozdev.org> timeless%mozdev.org <>
+travis <travis@sedsystems.ca> travis%sedsystems.ca <>
+vladd <vladd@bugzilla.org> vladd%bugzilla.org <>
+wurblzap <wurblzap@gmail.com> wurblzap%gmail.com <>
+zach <zach@zachlipton.com> zach%zachlipton.com <>