Merge remote branch 'upstream/master' into prv/po
[ikiwiki] / debian / link
1 usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
2 usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL