diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-07 10:41:34 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-07 10:41:34 +0200 |
| commit | accd8215ca9a1cb10e92a059d71eb02aac2f0743 (patch) | |
| tree | ad673f0421bf5dc2b3f6ab5e91f5dd074bd2661c /vendor/ubuntu/apt.conf-01-vendor-ubuntu | |
| parent | b32f5e0d93608f82a7516440a6da7a3131eb358e (diff) | |
| parent | 4694e07d450baa13fa04482752ca369a5797c640 (diff) | |
Merge branch 'debian/jessie' into ubuntu/master1.0.9.9ubuntu1
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'vendor/ubuntu/apt.conf-01-vendor-ubuntu')
0 files changed, 0 insertions, 0 deletions