Fix merge of commit 4a0b9981513059755b9fd15b38fc198f46a0d6f2.

[tinc] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 4721984..7c20a8d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,21 @@
 Main tinc authors:
 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>

 
 These files are from other sources:
  * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
  the syslog 1.3 sources.
 
 
 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.
 
 Also some of the macro files in the directory m4, and their
 accompanying files in lib, were taken from GNU fileutils.