Merge branch 'debian/sid' into debian/experimental

Conflicts:
	debian/changelog

diff --combined debian/changelog
index 193977d40d04630b57627f60da90455e69192b73,70743a29d17e6bb55fa8f56cc70808fe280b50a5..114f6c382d3606d2fab4cdd354b609caad14f5ed
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,35 +1,48 @@@
 +apt (1.1~exp1) UNRELEASED; urgency=low
 +
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - fix invalid InRelease file download checking and add regression
 +      test to server broken files to the buildin test webserver
 +  * stop exporting the accidently exported parsenetrc() symbol
 +  * [ABI-Break] lp:~mvo/apt/source-hashes:
 +    - use sha{512,256,1} for deb-src when available LP: #1098738
 +  * [ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 07 May 2014 17:48:24 +0200
 +
+ apt (1.0.5) unstable; urgency=low
+ 
+   [ Michael Vogt ]
+   * fix autopkgtest tests
+   * fix test-apt-ftparchive-cachedb-lp1274466 and apt-internal-solver tests
+   * test/integration/test-essential-force-loopbreak: fix on non-amd64 systems
+   * Tell the user if no updates are available after apt update (Closes: #751388)
+ 
+   [ Michele Orrù ]
+   * Check for gtest's header before building.
+ 
+   [ Chris Leick ]
+   * Updated translation of german documentation
+ 
+   [ Konstantin Manna ]
+   * fix two german manpage spelling mistakes (Closes: 751635)
+   * add missing comma in SEE ALSO of apt-secure manpage (Closes: 748506)
+ 
+   [ Fredrik Fornwall ]
+   * use P_ instead of ngettext to compiling with --disable-nls (Closes: 751857)
+ 
+   [ David Kalnischkies ]
+   * don't send pkg from an unknown architecture via EDSP
+   * fix SubstVar to be usable as a replace_all method
+   * show our broken packages message in 'apt' solver
+   * do not call resolver twice on (dist-)upgrade
+ 
+   [ Stefano Zacchiroli ]
+   * EDSP doc: clarify that Install/Remove packages are arch-qualified
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 18 Jun 2014 13:35:13 +0200
+ 
  apt (1.0.4) unstable; urgency=low
  
    [ Michael Vogt ]