Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Sun, 26 Jan 2014 07:15:29 +0000 (08:15 +0100)
committerMichael Vogt <mvo@debian.org>
Sun, 26 Jan 2014 07:15:29 +0000 (08:15 +0100)
commit796673c38509300c988fbba2f2679ba3c76916db
tree403055b486d0a1d65561528582d4b0bdc66e53a0
parent9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe
parent2f958de6e883ba7b0c9895750d4dde35047f1e82
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

Conflicts:
apt-private/private-list.cc
doc/po/de.po
test/integration/framework
apt-pkg/contrib/fileutl.cc
apt-pkg/deb/dpkgpm.cc
apt-private/private-list.cc
apt-private/private-search.cc
doc/po/de.po
test/integration/framework