new version of field 1.20110906
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs