We do
[x] keep it as it is (Moinmoin)
because this way we do not need to add something to existing pages
and it is John's preferance (as the most active wiki contributor).

So we are ready for migration, I'll ask Thomas Waldmann from waldmann-edv
if and when they are ready.