diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-11-03 08:59:19 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-11-03 08:59:19 +0100 |
| commit | 26f6e9b4c32c937d5a138404a9c1b94809c3afd6 (patch) | |
| tree | 5208d66e39a8c61ba9e9ade61dc1c03f0711d475 /COPYING | |
| parent | 0c535a8aedc34705ed115754796856a2b5d92a08 (diff) | |
| parent | 28460cb27846b2437010b08adf10bde18e370974 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions