Merge commit 'dkg/master'

[monkeysphere.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e6dfccd36bc3158628456f1f34a9ec062f049edb..64c2a09a3aba882e17158f104a50229486a8107d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
     of my own.
   * More monkeysphere-server diagnostics
   * monkeysphere --gen-subkey now guesses what KeyID you meant.
-  * set up host-key revocation
   * added Recommends: ssh-askpass to ensure monkeysphere --gen-subkey works
 
   [ Jameson Graef Rollins ]
@@ -15,8 +14,9 @@ monkeysphere (0.8-1) UNRELEASED; urgency=low
     be removed from key files.
   * enabled host key publication.
   * added checking of gpg.conf for keyserver
+  * new functions to add/revoke host key user IDs
 
- -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Fri, 15 Aug 2008 16:06:31 -0400
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Fri, 15 Aug 2008 15:02:48 -0700
 
 monkeysphere (0.7-1) experimental; urgency=low