Merge branch 'master' into 1.1

[meshlink] / THANKS

diff --git a/THANKS b/THANKS
index 6fa8f9c869d32c6a4d7009c8c1a3f7bf73e8be08..0e7e6928c89a317b16039c422a2486aff5fdad37 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -36,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