releasing version 3.20110715
[ikiwiki.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs