more updates for trail merge
[ikiwiki.git] / NEWS
1 debian/NEWS