diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /CREDITS | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 7 |
1 files changed, 7 insertions, 0 deletions
| @@ -2384,6 +2384,13 @@ N: Thomas Molina | |||
| 2384 | E: tmolina@cablespeed.com | 2384 | E: tmolina@cablespeed.com |
| 2385 | D: bug fixes, documentation, minor hackery | 2385 | D: bug fixes, documentation, minor hackery |
| 2386 | 2386 | ||
| 2387 | N: Paul Moore | ||
| 2388 | E: paul.moore@hp.com | ||
| 2389 | D: NetLabel author | ||
| 2390 | S: Hewlett-Packard | ||
| 2391 | S: 110 Spit Brook Road | ||
| 2392 | S: Nashua, NH 03062 | ||
| 2393 | |||
| 2387 | N: James Morris | 2394 | N: James Morris |
| 2388 | E: jmorris@namei.org | 2395 | E: jmorris@namei.org |
| 2389 | W: http://namei.org/ | 2396 | W: http://namei.org/ |