Merge branch 'master' into 1.1

[meshlink] / THANKS

diff --git a/THANKS b/THANKS
index 0698c47d653db5f8cccff50167bd7b9876f3a9d9..0e7e6928c89a317b16039c422a2486aff5fdad37 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
@@ -35,6 +36,7 @@ We would like to thank the following people for their contributions to tinc:
 * Nick Hibma
 * Nick Patavalis
 * Paul Littlefield
+* Philipp Babel
 * Robert van der Meulen
 * Rumko
 * Scott Lamb