Merge remote-tracking branch 'smcv/umask-keywords'
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs