Merge branch 'master' into 1.1

[tinc] / THANKS

diff --git a/THANKS b/THANKS
index f7e45bb..7d91271 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ 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
@@ -45,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