irc: fixed upstream
irssi-xmpp: fixed upstream
japanese wordpress: I suspect conflict is fixed upstream