and the other fixes waiting to be merged...
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs