diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-28 20:29:54 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-28 20:29:54 +0100 |
| commit | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (patch) | |
| tree | b879ccfbc9dba7a797ebe3414e1efed6737d6630 /debian/apt.conf.changelog | |
| parent | 8c55d4d117f1641650cd832c957ccdbf71b04893 (diff) | |
| parent | a4a5901577a2b0d72f1c973f036a8198046d937a (diff) | |
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'debian/apt.conf.changelog')
0 files changed, 0 insertions, 0 deletions