Merge branch 'master' into 1.1

[meshlink] / THANKS

diff --git a/THANKS b/THANKS
index 10eaca61e9c06e4d7f742600c646e79e986ab9bf..7d91271d3d0cbb401bba56faee0b96d1d0260bbb 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ We would like to thank the following people for their contributions to tinc:
 * Delf Eldkraft
 * dnk
 * Enrique Zanardi
+* Erik Tews
 * Flynn Marquardt
 * Grzegorz Dymarek
 * Hans Bayle
@@ -27,9 +28,11 @@ We would like to thank the following people for their contributions to tinc:
 * Mark Glines
 * Markus Goetz
 * Martin Kihlgren
+* Martin Schürrer
 * Matias Carrasco
 * Max Rijevski
 * Menno Smits
+* Mesar Hameed
 * Michael Tokarev
 * Miles Nordin
 * Nick Hibma
@@ -43,6 +46,7 @@ We would like to thank the following people for their contributions to tinc:
 * Teemu Kiviniemi
 * Timothy Redaelli
 * Tonnerre Lombard
+* Vil Brekin
 * Wessel Dankers
 * Wouter van Heyst