diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-29 14:39:27 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-29 14:39:27 +0100 |
| commit | e2264d3f957694e229a9f6976fc136b8f82ad770 (patch) | |
| tree | c1f0b9c64d1d60defe5ce1a89c6bc136d758a772 /COPYING | |
| parent | fd4e73c33c20873af670ee40b549c46ee0d50801 (diff) | |
| parent | c9a5f74bd57fa4fcf4e30cade8e48c5635448689 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions