summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-30 15:08:12 +0100
committerMichael Vogt <mvo@debian.org>2014-01-30 15:08:12 +0100
commit37c61d76869a50110e298b042660eb5120a282c8 (patch)
tree8acdf2275ed9e0e4584ed997d98844d3f5b3b179 /doc
parentacead5b93cf49ab33cba4be2ea8e1b253ed0f2bf (diff)
parent960975a175c2a21df749727162d5677cdc97a36e (diff)
Merge remote-tracking branch 'mvo/debian/sid' into ubuntu/master
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions