From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 17 Sep 2010 13:06:38 +0000 (+0200)
Subject: merged from lp:~donkult/apt/sid
X-Git-Tag: 0.8.5~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/cdf13dc287dcd4603152339364d894601e4a6c05

merged from lp:~donkult/apt/sid
---

cdf13dc287dcd4603152339364d894601e4a6c05
diff --cc debian/changelog
index 54e47957d,573cab419..1d7aeba78
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,12 @@@
  apt (0.8.5) UNRELEASED; urgency=low
  
+   [ Manpages translations ]
+   * German (Chris Leick). Closes: #597163
+ 
 +  [ Michael Vogt ]
 +  * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with
 +    conflicts/breaks against virtual packages (LP: #614993)
-   
++
    [ David Kalnischkies ]
    * apt-pkg/policy.cc:
      - support 100-pinning in Release file with ButAutomaticUpgrades