Merged from silc_1_0_branch (second merge).

[silc.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index 59220dbf18e215b9d0c0a5af9f88de566be2eefb..950df4ab24aa10282d2339a559a254564637a40c 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,8 +1,12 @@
 ----------------------------------------------------------------------------
 
 This is the credits file of people that have contributed to the SILC
-project.  It is supposed to by sorted by name and of the following format:
-name (N), email (E), web-address (W), PGP key ID and fingerprint (P),
+project.  Note that, having your name in this file does not give you
+automatically explicit or implicit copyright or ownership rights to the 
+SILC software.
+
+This file is supposed to by sorted by last name and of the following 
+format: name (N), email (E), web-address (W), PGP key ID and fingerprint (P),
 description (D), and snail-mail address (S).  The format is from the Linux
 kernel credits file. :)
 
@@ -24,17 +28,17 @@ E: bostik@lut.fi
 W: http://www.lut.fi/~bostik
 D: Server runs as a daemon on dedicated account
 D: Fixed inconsistencies in server side code routine names
-D: Transition to new configuration file format
+D: Man-pages
 S: Skinnarilankatu 28 E 2
 S: 53850 Lappeenranta
 S: Finland
 
-N: Johnny Mnemonic
+N: Giovanni Giacobbi
+E: giovanni@giacobbi.net
 E: johnny@themnemonic.org
-W: http://www.themnemonic.org/
-P: 1024D/34E2AB40 9AC6 1460 A5D0 4DB7 70D0  5DA5 C17F 50CD 34E2 AB40
+P: 1024D/B2D79FC1 6247 640C 1C90 1EE4 D800  E4E2 2D58 3DF1 B2D7 9FC1
+D: silcconfig, silclog, various patches around
 D: RPM packages
-D: silclog, misc bugfixes
 S: 35100 Padova
 S: Italy
 
@@ -45,7 +49,6 @@ P: 1024/A924ED4F AD 82 53 2D 84 FF C7 D1  FF 63 19 0E 1A 78 9F 8A  A9 24 ED 4F
 D: Protocol architect
 D: Main developer
 D: SILCNet coordinator and administrator
-S: Snellmanninkatu 34 A 15
 S: 70100 Kuopio
 S: Finland
 
@@ -58,6 +61,12 @@ S: Laserkatu 4 A 4
 S: 53850 Lappeenranta
 S: Finland
 
+N: Ville Räsänen
+E: ville.rasanen@iki.fi
+D: Client side of STATS-command 
+D: Some ROBOdoc formatting
+D: Bughunting
+
 N: Lubomir Sedlacik
 E: salo@Xtrmntr.org
 W: http://Xtrmntr.org
@@ -96,4 +105,14 @@ S: Arnyas ut 38-40/H
 S: 1121 Budapest
 S: Hungary
 
+N: Toni Willberg
+W: http://toniw.iki.fi/
+E: toniw@iki.fi
+D: bugzilla.silcnet.org admin
+D: silc.peelo.com admin
+D: Silc Admin development
+D: Testing
+S: Helsinki
+S: Finland
+
 ----------------------------------------------------------------------------