]> git.saurik.com Git - apt.git/commit
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
authorMichael Vogt <mvo@debian.org>
Fri, 29 Nov 2013 12:39:45 +0000 (13:39 +0100)
committerMichael Vogt <mvo@debian.org>
Fri, 29 Nov 2013 12:39:45 +0000 (13:39 +0100)
commite4a93f90b2e50f6833f7146496e574a5a9cedaca
tree836dd5e70b394f9996d4af0bdfcd52d2a388a007
parentfdef7c5e3a19c5f35ee952598124d0fe8d03c7ec
parentfaeb435cab7b41a50c621ef9f96853d15c57d0d8
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Conflicts:
apt-private/private-cmndline.cc
apt-private/private-cmndline.cc
apt-private/private-list.cc