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