summaryrefslogtreecommitdiff
path: root/dh
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-14 16:17:09 -0400
committerJoey Hess <joey@kitenet.net>2011-06-14 16:17:09 -0400
commitc64ed6af2930e40666aa3069d4e40a7dcd1bc1dd (patch)
treefe5ae4872f164c86381ccc154a6dd4d5e06e3b47 /dh
parent6aca0eba03b03e3c898b132f5a6d005118ed6d4c (diff)
parentcbe68c8579e8abc03aeff939306b2d34cb1fe8ac (diff)
Merge branch 'master' into smarter-targets
Conflicts: debhelper.pod debian/changelog
Diffstat (limited to 'dh')
0 files changed, 0 insertions, 0 deletions