summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-07-08 14:30:05 +0200
committerMichael Vogt <mvo@debian.org>2013-07-08 14:31:17 +0200
commitd1866f6a309b5f687cb92f724f17e435e30f3b93 (patch)
tree47c0e22bea652836ef1bef9510f27f5f020cecb2 /debian
parent4468de5560944f0c651f91111ba8940b639c792e (diff)
remove merge artifacts
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions