consolidating debian/changelog entries to 0.11-1, since 0.10-2 has never been (and...

diff --git a/debian/changelog b/debian/changelog
index 2cb713b68cf61bac74677d18474db67a442489f8..fb1c2f4fd436574ff9b0f5fc1219e59c60ba342e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,13 @@
 monkeysphere (0.11-1) UNRELEASED; urgency=low
 
+  [ Jameson Graef Rollins ]
   * fix bug in trustdb update on add/revoke-hostname.
 
- -- Jameson Graef Rollins <jrollins@phys.columbia.edu>  Tue, 19 Aug 2008 17:01:02 -0700
-
-monkeysphere (0.10-2) experimental; urgency=low
-
   [ Daniel Kahn Gillmor ]
   * debian/control: added Build-Depends: git-core for the new packaging
     format
-
- -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Tue, 19 Aug 2008 01:11:48 -0400
+  
+ -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Wed, 20 Aug 2008 11:24:35 -0400
 
 monkeysphere (0.10-1) experimental; urgency=low