a few more .mailmap entries

nikodemus · nikodemus · commit 2b4cb855f4f6 · 2012-06-10T00:02:28.000+03:00
Trying to pick a canonical email for each, so that

    git shortlog -se

  shows only one line per person.
diff --git a/.mailmap b/.mailmap
@@ -1,7 +1,31 @@
-Alastair Bridgewater <nyef@arisu.lisphacker.com> lisphacker <lisphacker>
-Tobias C. Rittweiler <trittweiler@users.sourceforge.net> trittweiler <trittweiler>
+Alastair Bridgewater <lisphacker@users.sourceforge.net> lisphacker <lisphacker>
+<lisphacker@users.sourceforge.net> <nyef@arisu.lisphacker.com>
+<lisphacker@users.sourceforge.net> <nyef@kana.lisphacker.com>
+<lisphacker@users.sourceforge.net> <nyef@virtdev-1.lisphacker.com>
+<lisphacker@users.sourceforge.net> <nyef_sbcl@lisphacker.com>
+
+Christophe Rhodes <csr21@cantab.net> <csr21@cam.ac.uk>
+
+Cyrus Harmon <ch-sbcl@bobobeach.com> <ch-github@bobobeach.com>
+
+Jim Wise <jimwise@users.sourceforge.net> <jwise@draga.com>
+<jimwise@users.sourceforge.net> <jwise@menegroth.draga.com>
+<jimwise@users.sourceforge.net> jimwise <jimwise>
+
 Martin Cracauer <cracauer@google.com> cracauer <cracauer>
-Richard M Kreuter <kreuter@users.sourceforge.net> kreuter <kreuter>
+
+Nathan Froyd <froydnj@gmail.com> <froydnj@cs.rice.edu>
+
+Nikodemus Siivola <nikodemus@random-state.net> <nikodemus@sb-studio.net>
+
 NIIMI Satoshi <sa2c@users.sourceforge.net> sa2c <sa2c>
+
 Paul Khuong <pvk@pvk.ca> pkhuong <pkhuong>
-Jim Wise <jimwise@users.sourceforge.net> jimwise <jimwise>
+
+Richard M Kreuter <kreuter@users.sourceforge.net> kreuter <kreuter>
+
+Robert Brown <brown@google.com> <robert.brown@gmail.com>
+
+Stas Boukarev <stassats@users.sourceforge.net> <stassats@gmail.com>
+
+Tobias C. Rittweiler <trittweiler@users.sourceforge.net> trittweiler <trittweiler>

-Original file line number
+Diff line change
 -Alastair Bridgewater <[email protected]> lisphacker <lisphacker>
 -Tobias C. Rittweiler <[email protected]> trittweiler <trittweiler>
 +Alastair Bridgewater <[email protected]> lisphacker <lisphacker>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
++
 +Christophe Rhodes <[email protected]> <[email protected]>
++
 +Cyrus Harmon <[email protected]> <[email protected]>
++
 +Jim Wise <[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> jimwise <jimwise>
++
 Martin Cracauer <[email protected]> cracauer <cracauer>
 -Richard M Kreuter <[email protected]> kreuter <kreuter>
++
 +Nathan Froyd <[email protected]> <[email protected]>
++
 +Nikodemus Siivola <[email protected]> <[email protected]>
++
 NIIMI Satoshi <[email protected]> sa2c <sa2c>
++
 Paul Khuong <[email protected]> pkhuong <pkhuong>
 -Jim Wise <[email protected]> jimwise <jimwise>
++
 +Richard M Kreuter <[email protected]> kreuter <kreuter>
++
 +Robert Brown <[email protected]> <[email protected]>
++
 +Stas Boukarev <[email protected]> <[email protected]>
++
 +Tobias C. Rittweiler <[email protected]> trittweiler <trittweiler>