]> git.saurik.com Git - apt.git/commit
Merge branch 'debian/sid' into ubuntu/master
authorMichael Vogt <mvo@debian.org>
Sat, 23 Nov 2013 08:13:30 +0000 (09:13 +0100)
committerMichael Vogt <mvo@debian.org>
Sat, 23 Nov 2013 08:13:30 +0000 (09:13 +0100)
commit7d2428e03c1fdae79488b9ecd53cc5257b2a0c13
tree81209b60212c997452fd74cf184b8ca5445e8bc0
parentf62f17b489405432a3125e51471d8a00e78c5170
parent61f954bff040809e7ab57b3adec2fe95339ffb94
Merge branch 'debian/sid' into ubuntu/master

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