Merge branch 'master' into openidselector
[ikiwiki.git] / debian / compat
1 7