summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2009-01-07 16:45:25 -0500
committerMatt Goins <mjgoins@openflows.com>2009-01-07 16:45:25 -0500
commit499aa3840041d9ddd5c680adce059260059aabf9 (patch)
tree4c9d2c144e69213fbc9b1f76ba9bc20e7152439b /COPYING
parentc3b912f2506c3a150f128a77317085cea599a814 (diff)
parentf8344402aebe5f0497a81934b980b9ed6ea7a6a2 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING2
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index c4aa418..a74c8cc 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@ 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>