summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-12 10:56:05 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-12 10:56:05 +0200
commit274a169155d8645968b13546c0b3f566c0f0db6c (patch)
tree16362bb7e14a025e232bbcab26a2134143a815ba /debian
parentddcf5c01d71746496d6fb9f218d846c5a40859af (diff)
parentde8b42b3a364a556cb602f514db60999b2038975 (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions