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