Move trail out of the contrib directory in preparation for eventual merge
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs