X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=AUTHORS;h=07939e8be535b95a37058fe3f49d6cdf0c30e890;hp=ac4e1a2256297bddc410cab34e998a02006286af;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=627f7c22b447bd464b536cd016278545674df93d

diff --git a/AUTHORS b/AUTHORS
index ac4e1a22..07939e8b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,13 +1,31 @@
 Main tinc authors:
-Guus Sliepen <guus@sliepen.eu.org>
-Ivo Timmermans <ivo@o2w.nl>
+
+- Guus Sliepen <guus@tinc-vpn.org>
+- Ivo Timmermans (inactive)
+
+Significant code contributions from:
+
+- Brandon Black <blblack@gmail.com>
+- Etienne Dechamps <etienne@edechamps.fr>
+- Florian Forster <octo@verplant.org>
+- Grzegorz Dymarek <gregd72002@googlemail.com>
+- Julien Muchembled <jm@jmuchemb.eu>
+- Loïc Grenié <loic.grenie@gmail.com>
+- Max Rijevski <maksuf@gmail.com>
+- Michael Tokarev <mjt@tls.msk.ru>
+- Scott Lamb <slamb@slamb.org>
+- Sven-Haegar Koch <haegar@sdinet.de>
+- Timothy Redaelli <timothy@redaelli.eu>
 
 These files are from other sources:
- * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
+
+* 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.
+Please see the file THANKS for a list of all contributors to tinc.