Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@ubuntu.com>
Mon, 29 Sep 2014 06:33:33 +0000 (08:33 +0200)
committerMichael Vogt <mvo@ubuntu.com>
Mon, 29 Sep 2014 06:33:33 +0000 (08:33 +0200)
commit48f3f1b24b48066cfc23342a5c6470ddf5e0fa6a
tree60fdc3dc5d238257bc85ea560cc63a697118ace3
parentffbe056dc554b3f1fdf79b4726415a70f6d59dc1
parente359fe101e1a66277b340563c96e868451d9d4b5
Merge branch 'debian/sid' into debian/experimental

Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.cc
apt-pkg/deb/debindexfile.cc
cmdline/apt-get.cc
methods/copy.cc
test/integration/framework
test/integration/test-bug-595691-empty-and-broken-archive-files