From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 26 Jul 2011 10:26:10 +0000 (+0200)
Subject: merge from debian-sid
X-Git-Tag: 0.9.13.exp1ubuntu1~159
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/9da189c583df34b9b3fd09b2f3f17a5ddd636dba?ds=sidebyside;hp=--cc

merge from debian-sid
---

9da189c583df34b9b3fd09b2f3f17a5ddd636dba
diff --cc debian/changelog
index d19ab59e6,1eeb99b98..746ee5924
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,4 +1,10 @@@
 +apt (0.8.15.4ubuntu1) UNRELASED; urgency=low
 +
 +  * merged from debian-sid
 +
 + -- 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: