Attribution for Julien Muchembled.

diff --git a/AUTHORS b/AUTHORS
index 7c20a8dff07e4045f3a472a2910d4eefc90479cd..cd4094854056f260f6c9f35d89d1046dbc76db5e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Significant contributions from:
 - Grzegorz Dymarek <gregd72002@googlemail.com>
 - Max Rijevski <maksuf@gmail.com>
 - Scott Lamb <slamb@slamb.org>
 - Grzegorz Dymarek <gregd72002@googlemail.com>
 - Max Rijevski <maksuf@gmail.com>
 - Scott Lamb <slamb@slamb.org>

+- Julien Muchembled <jm@jmuchemb.eu>

 
 These files are from other sources:
  * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from
 
 These files are from other sources:
  * lib/pidfile.h and lib/pidfile.c are by Martin Schulze, taken from

diff --git a/THANKS b/THANKS
index 08f17d58bee4256d54ce27f6954e2586e98bccbd..601116ef4de18c83d40f410ac00ead724f59dd6b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ We would like to thank the following people for their contributions to tinc:
 * Jason Harper
 * Jeroen Ubbink
 * Jerome Etienne
 * Jason Harper
 * Jeroen Ubbink
 * Jerome Etienne

+* Julien Muchembled

 * Lubomír Bulej
 * Mads Kiilerich
 * Marc A. Lehmann
 * Lubomír Bulej
 * Mads Kiilerich
 * Marc A. Lehmann

diff --git a/src/conf.c b/src/conf.c
index da58a45512d51b71ab8c2e200656e56ffc0423f3..f5f6c3a4cab25279ac6803a52984117a1202203b 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,8 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans

-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2010 Julien Muchembled <jm@jmuchemb.eu>

                  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
                  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify

diff --git a/src/tincd.c b/src/tincd.c
index dc9bf4696eddbb4fe0f1e2f3ca7e5c55955b5899..89e0c93405b697273edf84866fc14e9adb2f3fd1 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -4,6 +4,7 @@
                   2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>

+                  2010      Julien Muchembled <jm@jmuchemb.eu>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by