summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorxrs <xrs@mail36.net>2017-10-25 22:36:10 +0200
committerxrs <xrs@mail36.net>2017-10-25 22:36:10 +0200
commit92b6a83e9ba576ba237d47d780f3b9b10bb26588 (patch)
treebca8f723ca2de2ed76bd3bbe416bf9472a7b96cb /AUTHORS
parent9356f42f546d61ccfb6a3ec46605c9b83fdc8546 (diff)
parent17e755c71521be9a84f0f3b46d1de6962298f733 (diff)
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index b4ff5b571..e49319ac0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,7 +32,6 @@ Werner Koch <wk@gnupg.org>
Contributions also came from:
Adam Warrington [ UPnP ]
Adriano Peluso [ Documentation export to Texinfo ]
-ng0 <ng0@infotropique.org> [ Documentation export to Texinfo ]
Alex Harper [ OS X CPU load ]
Andrew McDonald <andrew@mcdonald.org.uk> [ SHA-512]
Andy Green <andy@warmcat.com>
@@ -69,6 +68,7 @@ Marko Räihä
Michael John Wensley <michael@wensley.org.uk>
Milan Bouchet-Valat <nalimilan@club.fr>
Nathan Evans <evans@net.in.tum.de>
+ng0 <ng0@infotropique.org> [ 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>