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