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