X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=AUTHORS;h=061d51379d8cdb3cab893f3cb64c27e4362dfbb7;hb=e500e9ec3678dfbb666d173854c134ac3858f8b1;hp=3c337737f4e7403c3eed11a55dbe97508fa99334;hpb=cc3d270b525cdc4756fa706221fd4ad510539700;p=oweals%2Fgnunet.git

diff --git a/AUTHORS b/AUTHORS
index 3c337737f..061d51379 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@ Homepage: https://gnunet.org/
 Maintainer: Christian Grothoff <christian@grothoff.org>
 Bug reports: https://bugs.gnunet.org
 Security related bug reports: security@gnunet.org
-License: some GPLv2+, mostly AGPLv3+
+License: mostly AGPLv3+, some (GPL3+,MIT/X11,LGPL3+,Public Domain,BSD-3)
 
 Primary developers (0.9.x series):
 Alejandra Morales
@@ -70,7 +70,7 @@ Marko Räihä
 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 ]
+nikita <nikita@n0.is> [ Documentation export to Texinfo ]
 Paul Ruth <ruth@cs.purdue.edu>
 Philipp Tölke <toelke@in.tum.de>, <pt@philipptoelke.de>
 Renaldo Ferreira <rf@cs.purdue.edu>
@@ -115,17 +115,17 @@ AFS Face      : Alex Jones <alexrjones@ntlworld.com>
 new GNU in Net: Nicklas Larsson <whybill@gmail.com>
 
 Package Maintainers (current and previous):
-FreeBSD         : Kirill Ponomarew <ponomarew@oberon.net>
+FreeBSD:          Kirill Ponomarew <ponomarew@oberon.net>
 Debian GNU/Linux: Bertrand Marc <bmarc@debian.org>
                   Daniel Baumann <daniel.baumann@panthera-systems.net>
                   Arnaud Kyheng
                   Glenn McGrath <bug1@debian.org>
-Nix:            : viric, rahul
-OpenWrt/LEDE    : Daniel Golle <daniel@makrotopia.org>
-OS X            : Jussi Eloranta <eloranta@cc.jyu.fi>
-Gentoo		: Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>
-                  N. Gillmann <ng0@n0.is>
-NetBSD pkgsrc   : N. Gillmann <ng0@n0.is>
+Nix:              viric, rahul
+OpenWrt/LEDE:     Daniel Golle <daniel@makrotopia.org>
+macOS:            Jussi Eloranta <eloranta@cc.jyu.fi>
+Gentoo:		  Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>
+                  nikita <nikita@n0.is>
+NetBSD pkgsrc:    nikita <nikita@NetBSD.org>
 
 If you have contributed and are not listed here, please
 notify one of the maintainers in order to be added.