add news item for ikiwiki 3.20110715
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs