X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=changelog;h=e29cbaf65cbda1ec51d7879c6e79ff55bae0b72f;hb=39d013c4d307d6a844f8dc2deabf42adc0a8a388;hp=8638da674cca1b2f074f8e89d73eef1b5befd657;hpb=1a64ed28ce14cdb98ff5ff15430ac03da0c3dc78;p=monkeysphere.git

diff --git a/changelog b/changelog
index 8638da6..e29cbaf 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,12 @@
-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)
+  * monkeysphere keys-for-userid now respects MONKEYSPHERE_CHECK_KEYSERVER
+    environment variable (and defaults to true)
 
- -- 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