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)
Conflicts:
configure.ac

1  2 
apt-pkg/deb/dpkgpm.cc
cmdline/apt-get.cc
debian/changelog

Simple merge
Simple merge
Simple merge