summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-07-10 16:38:55 +0200
committerMichael Vogt <mvo@debian.org>2013-07-10 16:38:55 +0200
commitd2636e63fd823e537f61b5e9d33a85aa0626f0aa (patch)
tree1041902cfd6820605314424f239b27c18ae4ef2b /debian
parent88f5f8258f0d6f9d3a188ccf8a89f36243ea14b5 (diff)
remove more merge artifacts
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions