]> git.saurik.com Git - apt.git/commitdiff
Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822
authorMichael Vogt <mvo@debian.org>
Tue, 10 Dec 2013 07:15:17 +0000 (08:15 +0100)
committerMichael Vogt <mvo@debian.org>
Tue, 10 Dec 2013 07:15:17 +0000 (08:15 +0100)
Conflicts:
apt-pkg/sourcelist.cc


Trivial merge