Merge remote-tracking branch 'smcv/ready/trail'
[ikiwiki] / NEWS
1 debian/NEWS