update
Merge branch 'master' of ssh://git.ikiwiki.info
Merge branch 'master' of ssh://git.ikiwiki.info
Merge branch 'master' of ssh://git.ikiwiki.info
po: If msgmerge falls over on a problem po file, print a warning message, but don't let this problem crash ikiwiki entirely.