diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /CREDITS | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -528,11 +528,11 @@ S: Oxford | |||
| 528 | S: United Kingdom | 528 | S: United Kingdom |
| 529 | 529 | ||
| 530 | N: Luiz Fernando N. Capitulino | 530 | N: Luiz Fernando N. Capitulino |
| 531 | E: lcapitulino@terra.com.br | 531 | E: lcapitulino@mandriva.com.br |
| 532 | E: lcapitulino@prefeitura.sp.gov.br | 532 | E: lcapitulino@gmail.com |
| 533 | W: http://www.telecentros.sp.gov.br | 533 | W: http://www.cpu.eti.br |
| 534 | D: Little fixes and a lot of janitorial work | 534 | D: misc kernel hacking |
| 535 | S: E-GOV Telecentros SP | 535 | S: Mandriva |
| 536 | S: Brazil | 536 | S: Brazil |
| 537 | 537 | ||
| 538 | N: Remy Card | 538 | N: Remy Card |