Merged silc_1_0_branch to trunk.

[silc.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index ec4260b5eb81d41f035a2dc7907fb796e041bb4f..950df4ab24aa10282d2339a559a254564637a40c 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -28,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
 
@@ -49,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
 
@@ -106,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
+
 ----------------------------------------------------------------------------