summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-28 20:28:08 +0100
committerMichael Vogt <mvo@debian.org>2014-02-28 20:28:08 +0100
commit8c55d4d117f1641650cd832c957ccdbf71b04893 (patch)
treeaa69ee9a261598e565619fd39e2f4c131106713a /vendor
parent821197c1198547077a8a0de5ebbb1b355ec33572 (diff)
parented9665aedf77b3b8345bd4ed33de7885738e29f0 (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'vendor')
0 files changed, 0 insertions, 0 deletions