Merge commit 'jrollins/master'

[monkeysphere.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index bd12e1a741b00437e3ea4b8833699ce65dbe3fd3..41af80cfed83d0f4dcfefed073bd641c00157799 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,11 @@ monkeysphere (0.2-1) UNRELEASED; urgency=low
   * Remove {update,remove}-userids functions, since we decided they
     weren't useful enough to be worth maintaining.
   * Better handling of unknown users in server update-users
+  * Add file locking when modifying known_hosts or authorized_keys
+  * Better failure/prompting for gen-subkey
+  * Add ability to set any owner trust level for keys in server keychain.
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Thu, 19 Jun 2008 18:08:57 -0400
+ -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Sun, 22 Jun 2008 11:42:42 -0400
 
 monkeysphere (0.1-1) experimental; urgency=low