From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 7 Feb 2014 18:48:11 +0000 (+0100)
Subject: Attribution for various contributors.
X-Git-Tag: release-1.1pre10~6
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=2f41780023bffc81fa42b0e72f67be86a52b370c;p=tinc

Attribution for various contributors.

Conflicts:
	THANKS
---

diff --git a/THANKS b/THANKS
index 6753c2f4..a624994b 100644
--- a/THANKS
+++ b/THANKS
@@ -14,21 +14,27 @@ We would like to thank the following people for their contributions to tinc:
 * Enrique Zanardi
 * Erik Tews
 * Etienne Dechamps
+* Florent Clairambault
 * Flynn Marquardt
+* Gary Kessler and Claudia Gonzalez
 * Grzegorz Dymarek
 * Hans Bayle
 * Ivo van Dong
+* James Cook
 * James MacLean
 * Jamie Briggs
 * Jason Harper
+* Jelle de Jong
 * Jeroen Ubbink
 * Jerome Etienne
 * Julien Muchembled
+* Lavrans Laading
 * Loïc Grenié
 * Lubomír Bulej
 * Mads Kiilerich
 * Marc A. Lehmann
 * Mark Glines
+* Mark Petryk
 * Markus Goetz
 * Martin Kihlgren
 * Martin Schobert
@@ -54,7 +60,7 @@ We would like to thank the following people for their contributions to tinc:
 * Wessel Dankers
 * Wouter van Heyst
 
-And everyone we forgot. Thank you!
+And everyone we forgot (if we did, please let us know). Thank you!
 
 Ivo Timmermans
 Guus Sliepen