]> git.saurik.com Git - apt.git/commitdiff
merged from debian-experimental2
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 28 Nov 2011 11:29:44 +0000 (12:29 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 28 Nov 2011 11:29:44 +0000 (12:29 +0100)
1  2 
debian/control
debian/rules

diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge