summaryrefslogtreecommitdiff
path: root/debian/apt.conf.changelog
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-07 17:54:11 +0100
committerMichael Vogt <mvo@debian.org>2013-12-07 17:54:11 +0100
commit8fafb8adc032002284f53359e1308efa609f9239 (patch)
tree2348ae1953446a069c0e44bcd20915c22c4d89b1 /debian/apt.conf.changelog
parentbc435af429f427c6a5db971c3d4cc7f15a2fe55d (diff)
parentce34af08ad6866869147e3525fa6c89d8dcb4601 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog debian/gbp.conf
Diffstat (limited to 'debian/apt.conf.changelog')
0 files changed, 0 insertions, 0 deletions