diff options
author | Michael Vogt <mvo@ubuntu.com> | 2015-03-20 17:40:50 +0100 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2015-03-20 17:40:50 +0100 |
commit | b4ede2eb709b15d93e6c8658803f15ae245dda6e (patch) | |
tree | 88514d368ff8552d35b1c09ef2cc04c3dd02eacb /debian/apt.conf.changelog | |
parent | 7a5380eb8413bb4e1c4bf28157865b9696dffeb0 (diff) | |
parent | d01fa806061db7f5d227a0784405987c78998c84 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'debian/apt.conf.changelog')
0 files changed, 0 insertions, 0 deletions