]> git.saurik.com Git - apt.git/commit
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental
authorMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 09:21:35 +0000 (11:21 +0200)
committerMichael Vogt <mvo@debian.org>
Wed, 18 Jun 2014 09:24:16 +0000 (11:24 +0200)
commit8d20b69d2fd7a8fec82bb559f0e39059bbaecf1b
tree000fce642c5c12f3cc8b5472bcd03994c78b5050
parent17091f2f33de16c2dae501e7868f7aec4fc3452f
parent82ced5c894cd013721f432ae8da66114155e04c7
Merge remote-tracking branch 'donkult/debian/sid' into debian/experimental

Conflicts:
apt-private/private-install.cc
apt-private/private-install.cc
cmdline/apt-internal-solver.cc