Merge remote-tracking branch 'schmonz/portability'
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs