]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Fri, 29 Nov 2013 13:39:27 +0000 (14:39 +0100)
committerMichael Vogt <mvo@debian.org>
Fri, 29 Nov 2013 13:39:27 +0000 (14:39 +0100)
commite2264d3f957694e229a9f6976fc136b8f82ad770
treec1f0b9c64d1d60defe5ce1a89c6bc136d758a772
parentfd4e73c33c20873af670ee40b549c46ee0d50801
parentc9a5f74bd57fa4fcf4e30cade8e48c5635448689
Merge branch 'debian/sid' into ubuntu/master

Conflicts:
debian/changelog
cmdline/apt-get.cc
debian/changelog
debian/control