Rebase our ikiwiki template changes on top of current upstream
We’re shipping two forked templates in
rsspage.tmpl. Since we have copied and modified these files, the
upstream ones have evolved a bit. It would be good to rebase our changes
on top of the current upstream ones.