hdiff
packages
feed
git-annex
-3.20110702: .gitattributes
debian/changelog merge=dpkg-mergechangelogs