Merging of the entire pre5 branch.

[meshlink] / THANKS

diff --git a/THANKS b/THANKS
index 81658b1a7e783698aa664cfcabcea4fe865ff822..0c50cf6241fcf367a3377959f0d6ffbc3bbd9227 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -15,7 +15,10 @@ We would like to thank
  * Enrique Zanardi (for the Spanish translation)
  * Matias Carrasco (for the Spanish translation of the manual)
  * Jamie Briggs (for finding a lot of socket leaks)
+ * Armijn Hemel (for being our very own PR manager)
+ * Jerome Etienne (for a thorough security analysis of tinc)
 
 for their help, support and ideas.  Thank you guys!
 
-And especially Guus Sliepen, for starting this whole project...
+Ivo Timmermans
+Guus Sliepen