Merge commit 'mjgoins/master'

[monkeysphere.git] / COPYING

diff --git a/COPYING b/COPYING
index 070c992d3be63fc4c151add26f4ba0be1c87bcae..a74c8cc669d96773817657d94da01d40bd488548 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -2,12 +2,12 @@ Monkeysphere is a system to use the OpenPGP web-of-trust to
 authenticate and encrypt ssh connections.
 
 It is free software, developed by:
-  Jameson Rollins <jrollins@fifthhorseman.net>
+  Jameson Graef Rollins <jrollins@finestructure.net>
   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>
+  Mike Castleman <m@mlcastle.net>
   Elliot Winard <enw@caveteen.com>
   Ross Glover <ross@ross.mayfirst.org>
   Greg Lyle <greg@stealthisemail.com>