summaryrefslogtreecommitdiff
path: root/debian/templates
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-04-05 15:48:20 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-04-05 15:48:20 -0400
commitb07320e49423c2035c196ce301abbb26ec06196c (patch)
tree7f44c69c65a5c91e3b0e547439e2e5b0c1e9765e /debian/templates
parent06dee2f59f4d2df0ee61ab7f302e2f8a7440a815 (diff)
parent9a7856d47e3ccd0eb97b242ee554e2841ee22cb5 (diff)
Merge commit 'jelmer/master'
Conflicts: debian/changelog
Diffstat (limited to 'debian/templates')
0 files changed, 0 insertions, 0 deletions