diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
| commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
| tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /LICENCE | |
| parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
| parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) | |
merge 5.7p1
Diffstat (limited to 'LICENCE')
| -rw-r--r-- | LICENCE | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -206,6 +206,7 @@ OpenSSH contains no GPL code. | |||
| 206 | Sun Microsystems | 206 | Sun Microsystems |
| 207 | The SCO Group | 207 | The SCO Group |
| 208 | Daniel Walsh | 208 | Daniel Walsh |
| 209 | Red Hat, Inc | ||
| 209 | 210 | ||
| 210 | * Redistribution and use in source and binary forms, with or without | 211 | * Redistribution and use in source and binary forms, with or without |
| 211 | * modification, are permitted provided that the following conditions | 212 | * modification, are permitted provided that the following conditions |