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