Merge branch 'ready/more-magic'
[git.ikiwiki.info.git] / CHANGELOG
1 debian/changelog