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