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