Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid
authorMichael Vogt <mvo@debian.org>
Wed, 9 Oct 2013 20:37:46 +0000 (22:37 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 9 Oct 2013 20:37:46 +0000 (22:37 +0200)

Trivial merge