touching up changelogs as we work toward a 0.29 release.

[monkeysphere.git] / changelog

diff --git a/changelog b/changelog
index cac28b8df98a40a32cc51f23fad54db56b514b4c..cba8b4ee2fe830201e8b4b65a7a1fa08b587b433 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+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