]> git.saurik.com Git - apt.git/commitdiff
merged from debian-sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 17 Feb 2011 17:34:36 +0000 (18:34 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 17 Feb 2011 17:34:36 +0000 (18:34 +0100)
1  2 
apt-pkg/depcache.cc
cmdline/apt-get.cc
debian/changelog
doc/po/fr.po

Simple merge
Simple merge
Simple merge
diff --cc doc/po/fr.po
Simple merge