diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-11-15 16:02:37 -0500 |
---|---|---|
committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-11-15 16:02:37 -0500 |
commit | 752a813b8bc606b8810baac8de18414e2da9b221 (patch) | |
tree | 876f93db5bbe0c96e06bf26574374d9207e1edbf /COPYING | |
parent | acac70fac9fabf81ed09b505129221545f7c0728 (diff) | |
parent | 8195dad4f5f2bb47d423cef587357979365e10b4 (diff) |
Merge commit 'jrollins/master'
Diffstat (limited to 'COPYING')
-rw-r--r-- | COPYING | 6 |
1 files changed, 3 insertions, 3 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: @@ -12,12 +12,12 @@ It is free software, developed by: 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. |