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