Merge branch 'master' of ssh://git.ikiwiki.info
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs