summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-11-05 17:48:11 +0100
committerMichael Vogt <mvo@ubuntu.com>2014-11-05 17:48:11 +0100
commit3e68f7e41022790619c698a32390a5256fadba7c (patch)
treed9a9e08517ecedc342177512921a2fba43615fa1 /vendor
parent6e2261d0f250406058d66b360080aa986953ae19 (diff)
parent28460cb27846b2437010b08adf10bde18e370974 (diff)
Merge branch 'debian/sid' into debian/experimental
Conflicts: debian/changelog
Diffstat (limited to 'vendor')
0 files changed, 0 insertions, 0 deletions