summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-10 08:15:17 +0100
committerMichael Vogt <mvo@debian.org>2013-12-10 08:15:17 +0100
commite2fa0aa64d2249129543f82a213043d96469be1c (patch)
tree0a55465ec6aa6b6fefdac5ccf7f8f01b3c9e998c /debian
parent35808e7a512d577e418b5e164d4fd5b58feaf42a (diff)
parent41c24955e8aa1303071348d77f661742270d05c0 (diff)
Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822
Conflicts: apt-pkg/sourcelist.cc
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions