Merge commit 'smcv/updated'
[git.ikiwiki.info.git] / NEWS
1 debian/NEWS