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