Merge branch 'master' into 1.1

[tinc] / THANKS

diff --git a/THANKS b/THANKS
index 0e7e692..f7e45bb 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -31,6 +31,7 @@ We would like to thank the following people for their contributions to tinc:
 * Matias Carrasco
 * Max Rijevski
 * Menno Smits
+* Mesar Hameed
 * Michael Tokarev
 * Miles Nordin
 * Nick Hibma