auto changelog merging
[ikiwiki.git] / .gitattributes
2010-06-25 Joey Hessauto changelog merging