summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-01-31 20:13:09 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-01-31 20:13:09 -0500
commit2b5cd0f910f28a601bcecfe68cdfc1ffd9b1362c (patch)
tree0d4701431f004cacd52995679e7fd28e2af9baa9 /src
parente4c566d5a1dd25d87d07dac1459a395321b9a5ef (diff)
parentddb8c65eb135c54fe21e20dafdf7b69a20107703 (diff)
Merge commit 'micah/master'
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere3
-rwxr-xr-xsrc/monkeysphere-authentication5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/monkeysphere b/src/monkeysphere
index 342d59a..46abf6f 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -6,8 +6,9 @@
# Jameson Rollins <jrollins@fifthhorseman.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Micah Anderson <micah@riseup.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
+# They are Copyright 2008-2009, and are all released under the GPL, version 3
# or later.
########################################################################
diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index bd8e540..56a8877 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -6,9 +6,10 @@
# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Micah Anderson <micah@riseup.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
########################################################################
set -e