From 41f547adb67c23f87f503edbabedf56fc439b072 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 18 Feb 2010 12:41:43 -0500
Subject: touching up changelogs as we work toward a 0.29 release.

---
 changelog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'changelog')

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
 
-- 
cgit v1.2.3