whitespace change to trigger buildbot for 1.10-b1

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

diff --git a/CREDITS b/CREDITS
index 83cf6c107a102bdc20ac202785a9c48d180c3575..fd69ae34470ebc573dab89f438edcbef3b4cae6e 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,12 +1,27 @@
-    This is at least a partial credits-file of people that have contributed to
-the Tahoe project.  It is formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), 
+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).
 
 Thanks.
 ----------
 
+N: Brian Warner
+E: warner-tahoe@lothar.com
+D: main developer
+
+N: Zooko
+E: zooko@zooko.com
+D: main developer
+
+N: Daira Hopwood (formerly David-Sarah Hopwood)
+E: daira@jacaranda.org
+E: david-sarah@jacaranda.org
+P: 3D6A 08E9 1262 3E9A 00B2 1BDC 067F 4920 98CF 2762 (preferred)
+P: 12F8 A95C C90B B68E 369C 003D 5947 3C63 3CB3 A807
+D: Tahoe-LAFS Hacker
+
 N: Faried Nawaz
 E: self@node.pk
 W: http://www.hungry.com/~fn/
@@ -21,9 +36,6 @@ D: improve logging, documentation, testing/porting/packaging (cygwin)
 N: Arc O Median
 D: bug reports
 
-N: Brian Warner
-D: code
-
 N: RobK
 D: code
 
@@ -52,7 +64,7 @@ D: packaging, buildbot
 E: cgalvan@enthought.com
 
 N: François Deppierraz
-D: unicode bug fix, testing, duplicity plugin
+D: encodings, duplicity, debugging, FUSE, docs, FreeBSD, WUI, ARM, NEWS
 E: francois@ctrlaltdel.ch
 
 N: Larry Hosken
@@ -69,7 +81,7 @@ D: mathematical analysis, code review, Win32 documentation
 
 N: Nils Durner
 E: ndurner@googlemail.com
-D: security bug report (cleartext login allmydata.com), darcsver bugfix
+D: security bug report, darcsver fix, Windows build docs, ftpd docs, bzr patch
 
 N: Kevin Reid
 E: kpreid@mac.com
@@ -86,7 +98,7 @@ D: patch Makefile to build .debs for Ubuntu Intrepid
 
 N: Kevan Carstensen
 E: kevan@isnotajoke.com
-D: optimize mutable files and directories, safer "tahoe mv"
+D: Tahoe-LAFS Hacker; MDMF, security, other improvements, code review, docs
 
 N: Marc Tooley
 W: http://rune.ca
@@ -94,4 +106,53 @@ P: 0xD5A7EE69911DF5CF
 D: port to NetBSD, help debugging Crypto++ bug
 
 N: Sam Mason
-D: edited docs/running.html
+D: edited docs/running.rst
+
+N: Jacob Appelbaum
+E: jacob@appelbaum.com
+W: http://www.appelbaum.net/
+P: 12E4 04FF D3C9 31F9 3405  2D06 B884 1A91 9D0F ACE4
+D: Debian packaging including init scripts
+
+N: Jeremy Visser
+D: Ubuntu packaging, usability testing
+
+N: Jeremy Fitzhardinge
+D: better support for HTTP range queries
+
+N: Frédéric Marti
+E: freestorm77@gmail.com
+P: 0xD703AE08, F1 82 35 BB FF D8 96 0B 68 E2  91 2F C4 B8 6A 42 D7 03 AE 08
+S: Lausanne - Switzerland
+D: fix layout issue and server version numbers in WUI
+
+N: Jacob Lyles
+E: jacob.lyles@gmail.com
+D: fixed bug in WUI with Python 2.5 and a system clock set far in the past
+
+N: Ravi Pinjala
+E: ravi@p-static.net
+D: converted docs from .txt to .rst
+
+N: Josh Wilcox
+D: docs, return None from get_stats() when there aren't enough samples
+
+N: Vince_II
+D: fix incorrect name of other doc file in docs/configuration.rst
+
+N: Markus Reichelt
+E: mr@mareichelt.com
+W: http://mareichelt.com/
+P: DCB3 281F 38B0 711A 41C0  DC20 EE8D 363D 1687 9738
+D: packaging for Slackware on SlackBuilds.org, bug reports
+
+N: Peter Le Bek
+E: peter@hyperplex.org
+P: 0x9BAC3E97, 79CA 34B3 7272 A3CF 82AC 5655 F55A 5B63 9BAC 3E97
+D: mtime in ftpd
+
+N: Andrew Miller
+E: amiller@dappervision.com
+W: http://soc1024.com
+P: 0xE3787A7250538F3F DEB3 132A 7FBA 37A5 03AC A462 E378 7A72 5053 8F3F
+D: bugfixes, patches