summaryrefslogtreecommitdiff
path: root/debian/apt.conf.changelog
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-11 14:51:24 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-11 14:51:24 +0200
commit695939dbf7649aab9cb5501938fa46726c890b72 (patch)
tree2870015a7c850438ae403828cf3eb24c646ac72a /debian/apt.conf.changelog
parentafaeea148553439684e6091f282bf5a4ee5c00d6 (diff)
parent686b484b407fdbef47d9f2064284a567b72417fe (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'debian/apt.conf.changelog')
0 files changed, 0 insertions, 0 deletions