Merging XMPP SoC branch

[William Ehlhardt]

On 7/9/07, Sean Egan <seanegan at gmail.com> wrote:
> The Adium team has two other SoC projects that have a dependency on
> the XMPP work that Andy (hal2k) has been doing.  Is there objection to
> merging his code in early and letting him continue to work in HEAD?

I don't care one way or the other, but if someone does object, the
Adium people who depend on his work could simply track the
im.pidgin.soc.2007.xmpp branch instead of im.pidgin.pidgin, relying on
Andreas to mtn propagate im.pidgin.pidgin -> im.pidgin.soc.2007.xmpp
regularly (this is what I do on my own branch). MTN should be able to
handle all the particulars of the final merge back to head at the end
of the summer without problem.

-William