Merge branch 'cvs' of github.com:schmonz/ikiwiki into cvs
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs