]> git.saurik.com Git - apt.git/commitdiff
merged from debian-sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Fri, 11 Feb 2011 08:08:37 +0000 (09:08 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Fri, 11 Feb 2011 08:08:37 +0000 (09:08 +0100)
1  2 
cmdline/apt-key
debian/changelog
po/apt-all.pot

diff --cc cmdline/apt-key
Simple merge
Simple merge
diff --cc po/apt-all.pot
Simple merge