Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sid
authorMichael Vogt <mvo@debian.org>
Sat, 17 Aug 2013 07:18:36 +0000 (09:18 +0200)
committerMichael Vogt <mvo@debian.org>
Sat, 17 Aug 2013 07:18:36 +0000 (09:18 +0200)
commitf49d103adc47c5c34f4ca852605ee55710e486b9
treeeb63a4d80a82b2d9f9aa5bc25165a21cb38b215f
parentb55e706a8794d810fb7c5a7c175c04ea207b1ce7
parentdd4d9729975fc2de37cd69220bc05efb16badc77
Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sid

Conflicts:
cmdline/apt-get.cc
apt-private/private-upgrade.cc
cmdline/apt-get.cc
debian/changelog