From 2f41780023bffc81fa42b0e72f67be86a52b370c Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 7 Feb 2014 19:48:11 +0100 Subject: [PATCH] Attribution for various contributors. Conflicts: THANKS --- THANKS | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/THANKS b/THANKS index 6753c2f..a624994 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 -- 2.25.1