Merge branch 'master' into 1.1

[tinc] / THANKS

diff --git a/THANKS b/THANKS
index 521f1a2..0e7e692 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ 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
@@ -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