summaryrefslogtreecommitdiff
path: root/apt-private/private-upgrade.cc
AgeCommit message (Collapse)Author
2013-08-17Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sidMichael Vogt
Conflicts: cmdline/apt-get.cc
2013-08-12squash merge of the feature/apt-binary branch without the changes from ↵Michael Vogt
experimental