Merge commit 'jelmer/master'
[ikiwiki] / NEWS
1 debian/NEWS