merge from debian-sid

diff --git a/debian/changelog b/debian/changelog
index d19ab59e69d49e06615539528658061721581672..746ee59245293606cae349a77c009c0ff3e17e90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ apt (0.8.15.4ubuntu1) UNRELASED; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jul 2011 12:24:59 +0200
 
-apt (0.8.15.4) UNRELEASEDunstable; urgency=low
+apt (0.8.15.4) unstable; urgency=low
 
   [ David Miller ]
   * apt-pkg/contrib/sha1.cc:
@@ -20,7 +20,7 @@ apt (0.8.15.4) UNRELEASEDunstable; urgency=low
       test)
   * refresh po/*
   
- -- Michael Vogt <mvo@debian.org>  Tue, 26 Jul 2011 11:58:27 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 26 Jul 2011 12:12:27 +0200
 
 apt (0.8.15.3) unstable; urgency=low