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