merged from lp:~donkult/apt/sid

diff --cc debian/changelog
index 54e47957daa43b84a6dffe04d4455c396a7df53f,573cab419afd98593eb1df80afefc511736c382b..1d7aeba780d04aecd4f7b14fbc41ba9053133999
--- 1/debian/changelog
--- 2/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