Merge branch 'master' into next
[ikiwiki.git] / debian / compat
2006-03-15  joeydebianise