This reverts commit 788872d12756ba95d34449b4bd37890e6ac01700
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs