Merge commit 'micah/master'

[monkeysphere.git] / COPYING

diff --git a/COPYING b/COPYING
index ab8788df38daa5caefb74d9b1035ef8a07fec4cc..36b1d0830bae7192573a4a3e47c2c929ed10f039 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,15 @@
 MonkeySphere is a system to use the OpenPGP web-of-trust to
 authenticate and encrypt ssh connections.
 
-It is free software, written by:
+It is free software, developed by:
   Jameson Rollins <jrollins@fifthhorseman.net>
-  Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>
-with much help from:
+  Daniel Kahn Gillmor <dkg@fifthhorseman.net>
   Jamie McClelland <jamie@mayfirst.org>
   Micah Anderson <micah@riseup.net>
   Matthew Goins <mjgoins@openflows.com>
+  Mike Castleman <mlcastle@mlcastle.net>
+  Elliot Winard <enw@caveteen.com>
+  Greg Lyle <greg@stealthisemail.com>
 
 MonkeySphere is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of