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