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