all done here, the folders patch now lives in my osm_folders branch and I am ditching...
[git.ikiwiki.info.git] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs