X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=blobdiff_plain;f=changelog;h=cba8b4ee2fe830201e8b4b65a7a1fa08b587b433;hp=8638da674cca1b2f074f8e89d73eef1b5befd657;hb=41f547adb67c23f87f503edbabedf56fc439b072;hpb=e3bb810e188cae2d40a5191500a501c85cb93381

diff --git a/changelog b/changelog
index 8638da6..cba8b4e 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
-monkeysphere (0.28.1) unstable; 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)
 
- -- Jameson Graef Rollins <jrollins@finestructure.net>  Thu, 04 Feb 2010 11:57:45 -0500
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 18 Feb 2010 12:38:43 -0500
 
 monkeysphere (0.28) unstable; urgency=low