summaryrefslogtreecommitdiff
path: root/vendor/ubuntu
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 09:39:35 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 09:39:35 +0200
commita1a253e8be978998b66af62240a25864db2cc694 (patch)
tree485efb6b77d063b08045153478e704e804242b7e /vendor/ubuntu
parent4c3722e3a74f183b331b0a782017ae442ca143fb (diff)
parent5ff678f7a22bb3206f5e46fcbdd00e56cb44b99e (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'vendor/ubuntu')
0 files changed, 0 insertions, 0 deletions