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