Never delete Subnets when StrictSubnets is set

[oweals/tinc.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index ac4e1a2256297bddc410cab34e998a02006286af..7c20a8dff07e4045f3a472a2910d4eefc90479cd 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,21 @@
 Main tinc authors:
 Main tinc authors:

-Guus Sliepen <guus@sliepen.eu.org>
-Ivo Timmermans <ivo@o2w.nl>
+- 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.