From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sun, 24 Aug 2008 20:54:02 +0000 (-0700)
Subject: Merge commit 'jamie/master'
X-Git-Tag: monkeysphere_0.12-1~66
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=3faf01e5d89ae1eb3802d55aef51daa660257417;p=monkeysphere.git

Merge commit 'jamie/master'
---

3faf01e5d89ae1eb3802d55aef51daa660257417
diff --cc doc/README
index 544465f,13dd5af..3be3c72
--- a/doc/README
+++ b/doc/README
@@@ -132,12 -103,8 +106,9 @@@ key to your ssh agent by running
  
  		monkeysphere subkey-to-ssh-agent
  
- You may want to add this command to your ~/.xsession file so it is run
- automatically everytime you login.
- 
  FIXME: using the key with a single session?
  
 +
  Miscellaneous
  -------------