]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Sat, 17 Aug 2013 08:07:20 +0000 (10:07 +0200)
committerMichael Vogt <mvo@debian.org>
Sat, 17 Aug 2013 08:07:20 +0000 (10:07 +0200)
commit1afd369d00f2f9272462ffc6c6e24f293a81459e
treec29c1671aceaf9055b6c89d1befab91fe375c32a
parent43ffe2d15bfff049d1ffe10c7696c008495f5912
parentb44c98f9d80ac59f6602e16e6aedd3a8f9f9485a
Merge branch 'debian/sid' into debian/experimental

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