Merge branch 'master' into 1.1

[tinc] / THANKS

diff --git a/THANKS b/THANKS
index 42b1c0a..7d91271 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