Merging XMPP SoC branch

[Sean Egan]

On 7/10/07, Andreas Monitzer <pidgin at monitzer.com> wrote:
> > Does it add new strings?
> Yes, esp. user mood has a huge list of strings to be translated.

Right! String freeze!

Andy, would you mind if we merged the branch with user-visible
string-adding features #ifdef'ed out to get the API additions in
2.1.0, and then got the new strings in 2.1.1, 3 weeks from now?

-s.