Merge remote branch 'remotes/smcv/ready/htmlbalance'
[ikiwiki] / .gitattributes
1 debian/changelog merge=dpkg-mergechangelogs