summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-29 20:11:47 +0100
committerMichael Vogt <mvo@debian.org>2013-11-29 20:11:47 +0100
commitec980be7637b735aa91d7091dae6e18b150cb724 (patch)
treeff2b4d4b2b3f9a5257a0de6d59039da3236049a1 /COPYING
parente2264d3f957694e229a9f6976fc136b8f82ad770 (diff)
parent804d195655c48a448d576b2b196d18c2c816e824 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions