merged from lp:~donkult/apt/sid

diff --combined debian/changelog
index ef402740685ac15e69feafc7515e2d878ecfd53a,3cd6aa4100812c215e3156af1457944816ebd931..1dffe9c255050b32ec165b46c17219d087962d02
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,17 @@@
- apt (0.8.15.9+nmu1) unstable; urgency=low
 -apt (0.8.15.10) unstable; urgency=low
++apt (0.8.15.10) UNRELEASEDunstable; urgency=low
  
    [ David Kalnischkies ]
    * algorithms.cc:
      - show a debug why a package was kept by ResolveByKeep()
+   * doc/manpage-style.xml:
+     - put <brackets> around email addresses
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 17 Oct 2011 16:36:22 +0200
+   [ Chris Leick ]
+   * German manpage translation update
+   * doc/*.xml:
+     - find and fix a bunch of misspellings
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 20 Nov 2011 18:02:08 +0100
  
  apt (0.8.15.9) unstable; urgency=low