diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 18:08:19 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 18:08:19 +0200 |
| commit | c2e39004370846f465cf60b6fb312664981179d8 (patch) | |
| tree | f9bfabdf95f3768a9b829327d08c58ffa14e36a9 /vendor/ubuntu | |
| parent | accd8215ca9a1cb10e92a059d71eb02aac2f0743 (diff) | |
| parent | ba95c69681dee8a0ae12ba635e56414820ee9113 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'vendor/ubuntu')
0 files changed, 0 insertions, 0 deletions