summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-05-22 18:08:19 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-05-22 18:08:19 +0200
commitc2e39004370846f465cf60b6fb312664981179d8 (patch)
treef9bfabdf95f3768a9b829327d08c58ffa14e36a9 /COPYING
parentaccd8215ca9a1cb10e92a059d71eb02aac2f0743 (diff)
parentba95c69681dee8a0ae12ba635e56414820ee9113 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions