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