-merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

[oweals/gnunet.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index d21b6e333d870032231516b8e00b537bd55fa424..ef7e2eb9de6b17584b7837e7aea17d35eac6fd9e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Alejandra Morales
 Andreas Fuchs
 Bart Polot <bart@net.in.tum.de>
 Bruno Cabral <bcabral@uw.edu>
 Andreas Fuchs
 Bart Polot <bart@net.in.tum.de>
 Bruno Cabral <bcabral@uw.edu>

+Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>

 Christian Fuchs <christian.fuchs@cfuchs.net>
 Christian Grothoff <christian@grothoff.org>
 Claudiu Olteanu
 Christian Fuchs <christian.fuchs@cfuchs.net>
 Christian Grothoff <christian@grothoff.org>
 Claudiu Olteanu


@@ -18,7 +19,8 @@ Fabian Oehlmann
 Florian Dold <florian.dold@gmail.com>
 Gabor X Toth <tg-x.net>
 LRN <lrn1986@gmail.com>
 Florian Dold <florian.dold@gmail.com>
 Gabor X Toth <tg-x.net>
 LRN <lrn1986@gmail.com>

-Martin Schanzenbach <schanzen@in.tum.de>
+Marcello Stanisci <marcello.stanisci@inria.fr>
+Martin Schanzenbach <mschanzenbach@posteo.de>

 Matthias Wachs <wachs@net.in.tum.de>
 Maximilian Szengel <gnunet@maxsz.de>
 Nils Durner <durner@gnunet.org>
 Matthias Wachs <wachs@net.in.tum.de>
 Maximilian Szengel <gnunet@maxsz.de>
 Nils Durner <durner@gnunet.org>


@@ -27,14 +29,18 @@ Sree Harsha Totakura --- http://sreeharsha.totakura.in/
 Stephan A. Posselt
 Werner Koch <wk@gnupg.org>
 
 Stephan A. Posselt
 Werner Koch <wk@gnupg.org>
 

-Code contributions also came from:
+Contributions also came from:

 Adam Warrington [ UPnP ]
 Adam Warrington [ UPnP ]

+Adriano Peluso [ Documentation export to Texinfo ]

 Alex Harper [ OS X CPU load ]
 Alex Harper [ OS X CPU load ]

+Amirouche Boubekki <amirouche@hypermove.net>

 Andrew McDonald <andrew@mcdonald.org.uk> [ SHA-512]
 Andy Green <andy@warmcat.com>
 Antti Salonen
 Blake Matheny <bmatheny@mobocracy.net>
 Andrew McDonald <andrew@mcdonald.org.uk> [ SHA-512]
 Andy Green <andy@warmcat.com>
 Antti Salonen
 Blake Matheny <bmatheny@mobocracy.net>

+Bertrand Marc <beberking@gmail.com>

 Clytie Siddall <clytie@riverland.net.au>
 Clytie Siddall <clytie@riverland.net.au>

+Daniel Golle <daniel@makrotopia.org>

 David Brodski
 David Kuehling <dvdkhlng@gmx.de>
 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 David Brodski
 David Kuehling <dvdkhlng@gmx.de>
 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>


@@ -53,18 +59,19 @@ Jake Dust <jakedust@gmail.com>
 James Blackwell <jblack@linuxguru.net>
 Jean-Luc Cooke <jlcooke@certainkey.com> [ SHA-512]
 Jussi Eloranta <eloranta@cc.jyu.fi>
 James Blackwell <jblack@linuxguru.net>
 Jean-Luc Cooke <jlcooke@certainkey.com> [ SHA-512]
 Jussi Eloranta <eloranta@cc.jyu.fi>

-Jürgen Appel <jappel@linux01.gwdg.de>
+Jürgen Appel <jappel@linux01.gwdg.de>

 Kevin Vandersloot <kfv101@psu.edu> [original code of gnome-system-monitor]
 Krista Bennett Grothoff <krista@grothoff.org>
 Kyle McMartin <kyle@debian.org> [ SHA-512]
 Larry Waldo
 Kevin Vandersloot <kfv101@psu.edu> [original code of gnome-system-monitor]
 Krista Bennett Grothoff <krista@grothoff.org>
 Kyle McMartin <kyle@debian.org> [ SHA-512]
 Larry Waldo

-Ludovic Courtès <ludo@chbouib.org>
-Marko Räihä
+Ludovic Courtès <ludo@chbouib.org>
+Marko Räihä

 Michael John Wensley <michael@wensley.org.uk>
 Milan Bouchet-Valat <nalimilan@club.fr>
 Nathan Evans <evans@net.in.tum.de>
 Michael John Wensley <michael@wensley.org.uk>
 Milan Bouchet-Valat <nalimilan@club.fr>
 Nathan Evans <evans@net.in.tum.de>

+Nils Gillmann <ng0@n0.is> [ Documentation export to Texinfo ]

 Paul Ruth <ruth@cs.purdue.edu>
 Paul Ruth <ruth@cs.purdue.edu>

-Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de>
+Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de>

 Renaldo Ferreira <rf@cs.purdue.edu>
 Risto Saarelma
 Roman Zippel
 Renaldo Ferreira <rf@cs.purdue.edu>
 Risto Saarelma
 Roman Zippel


@@ -81,6 +88,7 @@ Uli Luckas <luckas@musoft.de>
 Vasil Dimov <vd@datamax.bg>
 Vitaly Minko <vitaly.minko@gmail.com>
 Werner Koch <libgcrypt@g10code.com> [original code of libgcrypt]
 Vasil Dimov <vd@datamax.bg>
 Vitaly Minko <vitaly.minko@gmail.com>
 Werner Koch <libgcrypt@g10code.com> [original code of libgcrypt]

+xrs <xrs@mail36.net> [ multicast ]

 
 Translations (webpage, documentation, as far as known):
 Chinese    : Di Ma
 
 Translations (webpage, documentation, as far as known):
 Chinese    : Di Ma


@@ -97,7 +105,7 @@ Kinyarwanda: Steven Michael Murphy <murf@e-tools.com>
 Vietnamese : Phan Vinh Thinh <teppi82@gmail.com> and Clytie Siddall <clytie@riverland.net.au>
 Swedish    : Daniel Nylander <po@danielnylander.se>
 Spanish    : Miguel Angel Arruga Vivas <miguel.13@telefonica.net>
 Vietnamese : Phan Vinh Thinh <teppi82@gmail.com> and Clytie Siddall <clytie@riverland.net.au>
 Swedish    : Daniel Nylander <po@danielnylander.se>
 Spanish    : Miguel Angel Arruga Vivas <miguel.13@telefonica.net>

-Turkish    : Nilgün Belma Bugüner <nilgun@buguner.name.tr>
+Turkish    : Nilgün Belma Bugüner <nilgun@buguner.name.tr>

 
 Logos:
 GNU in Net    : Christian Muellner <chris@flop.de>
 
 Logos:
 GNU in Net    : Christian Muellner <chris@flop.de>


@@ -108,8 +116,9 @@ new GNU in Net: Nicklas Larsson <whybill@gmail.com>
 Maintainers:
 FreeBSD         : Kirill Ponomarew <ponomarew@oberon.net>
 Debian GNU/Linux: Daniel Baumann <daniel.baumann@panthera-systems.net>
 Maintainers:
 FreeBSD         : Kirill Ponomarew <ponomarew@oberon.net>
 Debian GNU/Linux: Daniel Baumann <daniel.baumann@panthera-systems.net>

+OpenWrt/LEDE    : Daniel Golle <daniel@makrotopia.org>

 OS X            : Jussi Eloranta <eloranta@cc.jyu.fi>
 OS X            : Jussi Eloranta <eloranta@cc.jyu.fi>

-
+Gentoo         : Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>

 
 If you have contributed and are not listed here, please
 notify one of the maintainers in order to be added.
 
 If you have contributed and are not listed here, please
 notify one of the maintainers in order to be added.