summaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-01 17:49:06 +0200
committerMichael Vogt <mvo@debian.org>2014-04-01 17:49:06 +0200
commit4c3722e3a74f183b331b0a782017ae442ca143fb (patch)
tree683cb69a004aedcf38151aadf0a30c5261ffe83e /debian/rules
parentd13bb95849fd168200554972b4295c40933e2461 (diff)
parent5cfd6ef6c6ad67658c042453075e54ac23d10245 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'debian/rules')
0 files changed, 0 insertions, 0 deletions