summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Kelley <phkelley@hotmail.com>2012-11-22 08:10:35 -0800
committerPhilip Kelley <phkelley@hotmail.com>2012-11-22 08:10:35 -0800
commit5d4cdb0494267fc778eaa0f587978e1b25564dcd (patch)
tree9ba221ad16c51ecb01da6666790c083e8d2e24eb
parent54be4d57ed3cfbfb8c970f04422f840bcb731ddd (diff)
parent3728dfc0568e77e8aa5fc427306544b3171d8d6c (diff)
downloadlibgit2-5d4cdb0494267fc778eaa0f587978e1b25564dcd.tar.gz
Merge pull request #1095 from martinwoodward/authors
Update to Authors
-rw-r--r--AUTHORS2
-rw-r--r--git.git-authors3
2 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 94f6c1e36..7f6ea7756 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 026b35fa8..591ffecf3 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>