Import Upstream version 1.1~pre11

AUTHORS

@@ -1,20 +1,25 @@
 Main tinc authors:
+
 - Guus Sliepen <guus@tinc-vpn.org>
 - Ivo Timmermans (inactive)
 
-Significant contributions from:
-- Michael Tokarev <mjt@tls.msk.ru>
+Significant code contributions from:
+
+- Brandon Black <blblack@gmail.com>
+- Etienne Dechamps <etienne@edechamps.fr>
 - 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>
+- 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
@@ -23,5 +28,4 @@ These files are from other sources:
 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.