Merge branch 'master' into templatemove
[ikiwiki] / NEWS
1 debian/NEWS