Merge branch 'master' into 1.1

[meshlink] / THANKS

diff --git a/THANKS b/THANKS
index f26f268c46df5fba2130115b8c1392b466ce3eab..0e7e6928c89a317b16039c422a2486aff5fdad37 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -3,12 +3,14 @@ We would like to thank the following people for their contributions to tinc:
 * Alexander Reil and Gemeinde Berg
 * Allesandro Gatti
 * Andreas van Cranenburgh
+* Anthony G. Basile
 * Armijn Hemel
 * Brandon Black
 * Cris van Pelt
 * Delf Eldkraft
 * dnk
 * Enrique Zanardi
+* Erik Tews
 * Flynn Marquardt
 * Grzegorz Dymarek
 * Hans Bayle
@@ -34,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