X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=AUTHORS;h=af11393899292f1b346d5d910e0ed91212f2138c;hp=532543f4edb47f854fa28df65f01bfb58b064951;hb=5b708764db21833fe88c4db942b30d3ea91536fa;hpb=30df5e95dbe585c6076d743d3771a42ad7c78590

diff --git a/AUTHORS b/AUTHORS
index 532543f4..af113938 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +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.
+
+* 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.