Merge branch 'master' of metalzone.distorted.org.uk:~mdw/public-git/tripe

[tripe] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e2cc8d2..03aa001 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tripe (1.0.0pre9maemo1) experimental; urgency=low
+
+  * Make conntrack rather more robust against errors.
+  * Logically separate key tags from peer names.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Mon, 17 May 2010 20:27:33 +0100
+
 tripe (1.0.0pre8.1maemo1) experimental; urgency=low
 
   * Maemo-specific hacking: remove GUI stuff and Wireshark integration;