Remove -u shortcut for 'tahoe ls --uri' which clashes with --node-url. fixes ticket...

[tahoe-lafs/tahoe-lafs.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index de461938fbd64dd66461a6db1eac65b4982c182d..8dafeaa56512cfff8f7876fe29c28bfa348fabf4 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,24 +1,26 @@
 This is at least a partial credits-file of people that have contributed to
 the Tahoe-LAFS project.  It is formatted to allow easy grepping and
 beautification by scripts.  The fields are: name (N), email (E),
-web-address (W), PGP key ID and fingerprint (P), description (D), and
-snail-mail address (S).
+web-address (W), PGP key ID and fingerprint (P), physical location (S),
+and description (D).
 
 Thanks.
 ----------
 
 N: Brian Warner
-E: warner-tahoe@lothar.com
+E: warner@lothar.com
+P: A476 E2E6 1188 0C98 5B3C  3A39 0386 E81B 11CA A07A
 D: main developer
 
 N: Zooko
 E: zooko@zooko.com
 D: main developer
 
-N: David-Sarah Hopwood
-E: david-sarah@jacaranda.org
-P: 12F8 A95C C90B B68E 369C 003D 5947 3C63 3CB3 A807
-D: Tahoe-LAFS Hacker
+N: Daira Hopwood
+E: daira@jacaranda.org
+P: 3D6A 08E9 1262 3E9A 00B2 1BDC 067F 4920 98CF 2762
+S: Manchester, UK
+D: main developer
 
 N: Faried Nawaz
 E: self@node.pk
@@ -58,12 +60,12 @@ N: Justin Boreta
 D: user testing and docs
 
 N: Chris Galvan
-D: packaging, buildbot
 E: cgalvan@enthought.com
+D: packaging, buildbot
 
 N: François Deppierraz
-D: encodings, duplicity, debugging, FUSE, docs, FreeBSD, WUI, ARM, NEWS
 E: francois@ctrlaltdel.ch
+D: encodings, duplicity, debugging, FUSE, docs, FreeBSD, WUI, ARM, NEWS
 
 N: Larry Hosken
 E: tahoe@lahosken.san-francisco.ca.us
@@ -82,7 +84,7 @@ E: ndurner@googlemail.com
 D: security bug report, darcsver fix, Windows build docs, ftpd docs, bzr patch
 
 N: Kevin Reid
-E: kpreid@mac.com
+E: kpreid@switchb.org
 D: security bug report, W3 standards, new improved WUI style
 
 N: Alberto Berti
@@ -154,3 +156,39 @@ E: amiller@dappervision.com
 W: http://soc1024.com
 P: 0xE3787A7250538F3F DEB3 132A 7FBA 37A5 03AC A462 E378 7A72 5053 8F3F
 D: bugfixes, patches
+
+N: Frederick B
+E: freddy@flashpad ?
+D: fix wrong index in tahoe cp --verbose
+
+N: Patrick McDonald
+E: marlowe@antagonism.org
+D: documentation
+
+N: Mark Berger
+E: mark.berger.j@gmail.com
+D: servers of happiness
+
+N: Leif Ryge
+E: leif@synthesize.us
+D: bugfixes, documentation, web UI
+
+N: Tony Arcieri
+E: tony.arcieri@gmail.com
+D: web UI improvements
+
+N: A. Montero
+E: amontero@tinet.org
+D: documentation
+
+N: Ramakrishnan Muthukrishnan
+E: ram@rkrishnan.org
+D: Mac OS X packaging
+
+N: Loose Cannon
+E: lcstyle@gmail.com
+D: fix the Download! button on the Welcome page
+
+N: Jean-Paul Calderone
+E: exarkun@twistedmatrix.com
+D: support SFTP public key authentication.