Merge remote branch 'intrigeri/po'
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs