Merging Pidgin 2.x.y code into default branch

[Andrew Victor]

hi Mark,

> I know you guys had done some work on both branches. It looks like
> most of the mxit changes in the 2.x.y branch are copied from main.
> Should I just avoid merging mxit code from 2.x.y to main? Is that the
> best thing to do?

I did a diff between the two branches, and I also don't see any
Mxit-specific changes in 2.x.y that are not already in main.
I don't think we'd add anything in 2.x.y that is not also applicable
to 3.0.0 at this time - so a merge should be fine.


Regards,
  Andrew Victor