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