Merge branch 'ready/tag-test' into transient-tag
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs