Merge branch 'master' of git://github.com/wking/ikiwiki
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs