Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / THANKS

diff --git a/THANKS b/THANKS
index ed57da59cd8e1ab2266c6c48cd98da45f832379e..521f1a20990c26d8bf5e496085a220258ac227cd 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -4,9 +4,12 @@ We would like to thank the following people for their contributions to tinc:
 * Allesandro Gatti
 * Andreas van Cranenburgh
 * Armijn Hemel
-* dnk
+* Brandon Black
 * Cris van Pelt
+* Delf Eldkraft
+* dnk
 * Enrique Zanardi
+* Erik Tews
 * Flynn Marquardt
 * Grzegorz Dymarek
 * Hans Bayle
@@ -16,6 +19,8 @@ We would like to thank the following people for their contributions to tinc:
 * Jason Harper
 * Jeroen Ubbink
 * Jerome Etienne
+* Julien Muchembled
+* Loïc Grenié
 * Lubomír Bulej
 * Mads Kiilerich
 * Marc A. Lehmann
@@ -27,12 +32,15 @@ We would like to thank the following people for their contributions to tinc:
 * Menno Smits
 * Michael Tokarev
 * Miles Nordin
+* Nick Hibma
 * Nick Patavalis
 * Paul Littlefield
 * Robert van der Meulen
+* Rumko
 * Scott Lamb
 * Sven-Haegar Koch
 * Teemu Kiviniemi
+* Timothy Redaelli
 * Tonnerre Lombard
 * Wessel Dankers
 * Wouter van Heyst