touching up changelogs as we work toward a 0.29 release.

[monkeysphere.git] / changelog

diff --git a/changelog b/changelog
index b370958da0bd49de27883c54d75a9b5bb57af65d..cba8b4ee2fe830201e8b4b65a7a1fa08b587b433 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,4 +1,12 @@
-monkeysphere (0.28~pre1) UNRELEASED; urgency=low
+monkeysphere (0.29~pre1) UNRELEASED; urgency=low
+
+  * Fix man page typo about monkeysphere authorized_keys location
+  * Monkeysphere should work properly even if the user has "armor" in
+    their gpg.conf (closes MS #1625)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 18 Feb 2010 12:38:43 -0500
+
+monkeysphere (0.28) unstable; urgency=low
 
   * Major rework of monkeysphere-host to handle multiple host keys.  We
     also no longer assume ssh service keys.  monkeysphere-host is now a
@@ -6,7 +14,7 @@ monkeysphere (0.28~pre1) UNRELEASED; urgency=low
   * Rename keys-from-userid command to more accurate keys-for-userid
   * separate upstream and debian changelogs
 
- -- Jameson Rollins <jrollins@finestructure.net>  Sat, 16 Jan 2010 12:21:34 -0500
+ -- Jameson Rollins <jrollins@finestructure.net>  Tue, 19 Jan 2010 13:50:31 -0500
 
 monkeysphere (0.27) unstable; urgency=low