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)
commite2fa0aa64d2249129543f82a213043d96469be1c
tree0a55465ec6aa6b6fefdac5ccf7f8f01b3c9e998c
parent35808e7a512d577e418b5e164d4fd5b58feaf42a
parent41c24955e8aa1303071348d77f661742270d05c0
Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822

Conflicts:
apt-pkg/sourcelist.cc