Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/apt.cron.daily
Simple merge

diff --cc debian/changelog
index a394803,a3dd9af..66ce3ce
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,27 @@@
- apt (0.9.15.3ubuntu1) trusty; urgency=low
++apt (0.9.15.4ubuntu1) UNRELEASEDtrusty; urgency=low
 +
 +  * merge with debian/sid
 +
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 20 Feb 2014 16:32:57 +0100
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Sun, 23 Feb 2014 00:45:20 +0100
++
+ apt (0.9.15.4) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * remove auto-generated apt-key and sources.list on clean (closes: 739749)
+   * add testcase for Bug#718329
+   * various fixes for ADT failures
+   
+   [ Jon Severinsson ]
+   * add apt-vendor information for tanglu
+ 
+   [ Guillem Jover ]
+   * ExtractTar: Allow an empty decompressor program
+   * DebFile: Refactor ExtractTarMember() out from ExtractArchive()
+   * Add support for data.tar, control.tar and control.tar.xz
+   * debian: Add debDebFile::ExtractTarMember to the symbols file
+   * Fix typos in documentation (codespell)
+ 
+  -- Michael Vogt <mvo@debian.org>  Sun, 23 Feb 2014 00:27:12 +0100
  
  apt (0.9.15.3) unstable; urgency=medium