Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Sat, 25 Jan 2014 21:40:04 +0000 (22:40 +0100)
committerMichael Vogt <mvo@debian.org>
Sat, 25 Jan 2014 21:40:04 +0000 (22:40 +0100)
commit6fa5b7b71e5c8ec5d4bec7bec3ef311c4d9c826b
treea02ec2b10f30e713eedd3f7c63cc44051fb6c859
parent72af508bdbca55d0752aab3369faa1dc944a04e7
parent9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
configure.ac
apt-pkg/deb/dpkgpm.cc
cmdline/apt-get.cc
debian/changelog