X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=AUTHORS;h=af11393899292f1b346d5d910e0ed91212f2138c;hp=aa39942e613aeccbd574b07e4cfb07c6242727ad;hb=4a66370224e44b9fdd9b80b8360d4ac0f1a6b54c;hpb=ee96ccabbbf0180d5631d3c22838456f28ee9c15

diff --git a/AUTHORS b/AUTHORS
index aa39942..af11393 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,27 @@
 Main tinc authors:
-Guus Sliepen <guus@sliepen.warande.net>
-Ivo Timmermans <itimmermans@bigfoot.com>
+- Guus Sliepen <guus@tinc-vpn.org>
+- Ivo Timmermans (inactive)
+
+Significant contributions from:
+- Michael Tokarev <mjt@tls.msk.ru>
+- Florian Forster <octo@verplant.org>
+- Grzegorz Dymarek <gregd72002@googlemail.com>
+- Max Rijevski <maksuf@gmail.com>
+- Scott Lamb <slamb@slamb.org>
+- Julien Muchembled <jm@jmuchemb.eu>
+- Timothy Redaelli <timothy@redaelli.eu>
+- Brandon Black <blblack@gmail.com>
+- Loïc Grenié <loic.grenie@gmail.com>
 
 These files are from other sources:
  * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
  the syslog 1.3 sources.
- * The files in cipher/blowfish/ are from the SSLeay package by
- Eric Young.
+
+* src/bsd/tunemu.c and tunemu.h are by Friedrich Schöller
+  <friedrich.schoeller@gmail.com>
+
+Also some of the macro files in the directory m4, and their
+accompanying files in lib, were taken from GNU fileutils.
+
+Please see the file THANKS for more information on contributions from
+users.