Commit 5d4cdb0494267fc778eaa0f587978e1b25564dcd

Philip Kelley 2012-11-22T08:10:35

Merge pull request #1095 from martinwoodward/authors Update to Authors

diff --git a/AUTHORS b/AUTHORS
index 94f6c1e..7f6ea77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,9 +16,11 @@ Daniel Huckstep
 Dave Borowitz
 David Boyce
 David Glesser
+Dmitry Kakurin
 Dmitry Kovega
 Emeric Fermas
 Emmanuel Rodriguez
+Holger Weiss
 Ingmar Vanhassel
 J. David Ibáñez
 Jakob Pfender
diff --git a/git.git-authors b/git.git-authors
index 026b35f..591ffec 100644
--- a/git.git-authors
+++ b/git.git-authors
@@ -44,6 +44,7 @@ ok	Boyd Lynn Gerber <gerberb@zenez.com>
 ok	Brian Gernhardt <benji@silverinsanity.com>
 ok	Christian Couder <chriscool@tuxfamily.org>
 ok	Daniel Barkalow <barkalow@iabervon.org>
+ok	Holger Weiss <holger@zedat.fu-berlin.de>
 ok	Jeff King <peff@peff.net>
 ok	Johannes Schindelin <Johannes.Schindelin@gmx.de>
 ok	Johannes Sixt <j6t@kdbg.org>
@@ -53,7 +54,7 @@ ok	Linus Torvalds <torvalds@linux-foundation.org>
 ok	Lukas Sandström <lukass@etek.chalmers.se>
 ok	Matthieu Moy <Matthieu.Moy@imag.fr>
 ign	Mike McCormack <mike@codeweavers.com> (imap-send)
-ok	Nicolas Pitre <nico@cam.org>
+ok	Nicolas Pitre <nico@fluxnic.net> <nico@cam.org>
 ok	Paolo Bonzini <bonzini@gnu.org>
 ok	Paul Kocher <paul@cryptography.com>
 ok	Peter Hagervall <hager@cs.umu.se>