From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 1 Feb 2009 01:13:09 +0000 (-0500)
Subject: Merge commit 'micah/master'
X-Git-Tag: monkeysphere_0.23~156^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b5cd0f910f28a601bcecfe68cdfc1ffd9b1362c;p=monkeysphere.git

Merge commit 'micah/master'
---

2b5cd0f910f28a601bcecfe68cdfc1ffd9b1362c
diff --cc src/monkeysphere-authentication
index bd8e540,d7ec40f..56a8877
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@@ -3,16 -3,15 +3,17 @@@
  # monkeysphere-authentication: Monkeysphere authentication admin tool
  #
  # The monkeysphere scripts are written by:
 -# Jameson Rollins <jrollins@fifthhorseman.net>
 +# 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
 +
  PGRM=$(basename $0)
  
  SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}