Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid

Conflicts:
	debian/changelog

diff --cc debian/changelog
index de838bf0e555b3ec7a3b26863e6b5c3c51592f38,526fdcc2b05d222d82dc648cabc27a886a757b6b..74674786e7a633591206205d72a8a7bc8815c16c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,10 +1,33 @@@
+ apt (0.9.12) UNRELEASED; urgency=low
+ 
+   [ Trần Ngọc Quân ]
+   * Update Vietnamese translation. Closes: #720752
+ 
+  -- Christian Perrier <bubulle@debian.org>  Sun, 25 Aug 2013 15:39:40 +0200
+ 
 +apt (0.9.11.1) unstable; urgency=low
 +
 +  [ Michael Vogt ]
 +  * more coverity fixes:
 +    - explicit init 
 +    - always chdir("/") after chroot()
 +    - ftparchive/override.cc: fix "skip empty lines" code, the pointer 
 +      needs to get de-referenced first
 +  * dselect/update: 
 +    - remove "-f" option for apt-get update to fix breakage (closes: 720532)
 +
 +  [ Christopher Baines ]
 +  * Add test for bug #507998
 +
 +  [ David Kalnischkies ]
 +  * add a breaks libapt-inst for FileFd changes in 0.9.9 (Closes: 720449)
 +  * add versions to manpages-it Replaces+Breaks
 +
 +  [ Ángel Guzmán Maeso ]
 +  * apt-pkg:contrib Avoid compiler warning about sign-compare
 +
 + -- Michael Vogt <mvo@debian.org>  Sat, 24 Aug 2013 09:13:27 +0200
 +
  apt (0.9.11) unstable; urgency=low
  
    [ Daniel Hartwig ]