Merging Pidgin 2.x.y code into default branch

[Tomasz Wasilczyk]

W dniu 10.01.2014 07:40, Mark Doliner pisze:
> Hi Andrew and Pieter! I'd like to merge the code from our 2.x.y branch to main.
>
> 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 recently merged 2.x.y into main few days ago (in f017a2e85832). I 
don't recall any mxit differences.

Tomek

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4225 bytes
Desc: Kryptograficzna sygnatura S/MIME
URL: <https://pidgin.im/pipermail/devel/attachments/20140110/ff669607/attachment-0001.bin>