diff options
| author | Matt Goins <mjgoins@openflows.com> | 2008-11-16 11:18:38 -0500 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2008-11-16 11:18:38 -0500 |
| commit | e7c994d6f67d380ed0de21f1500ec395eaab6640 (patch) | |
| tree | e4c81a45e2dcfdd46409beab222d122751f5f6d7 /COPYING | |
| parent | 9aec501a27b51523165a05c4c4da0cc9251424e8 (diff) | |
| parent | 5d9949335aeb1dec04f530cbb3dfcac24288706a (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -MonkeySphere is a system to use the OpenPGP web-of-trust to +Monkeysphere is a system to use the OpenPGP web-of-trust to authenticate and encrypt ssh connections. It is free software, developed by: @@ -7,17 +7,17 @@ It is free software, developed by: Jamie McClelland <jamie@mayfirst.org> Micah Anderson <micah@riseup.net> Matthew Goins <mjgoins@openflows.com> - Mike Castleman <mlcastle@mlcastle.net> + Mike Castleman <m@mlcastle.net> Elliot Winard <enw@caveteen.com> Ross Glover <ross@ross.mayfirst.org> Greg Lyle <greg@stealthisemail.com> -MonkeySphere is distributed in the hope that it will be useful, but +Monkeysphere is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -MonkeySphere Copyright 2007, and are all released under the GPL, +Monkeysphere Copyright 2007, and are all released under the GPL, version 3 or later. |