pidgin: 60c1ce6b: merge of '2d746b537f7c15aca747b7df2e1eed...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 60c1ce6b0f129eaef5053f2ef82976f75b6ce6ca
Ancestor: 2d746b537f7c15aca747b7df2e1eedb540eb0baf
Ancestor: e09226ff43686401f45368b4047b907c205abfba
Author: darkrain42 at pidgin.im
Date: 2009-05-22T00:21:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/60c1ce6b0f129eaef5053f2ef82976f75b6ce6ca

Modified files:
        libpurple/nat-pmp.c libpurple/protocols/jabber/bosh.c
        libpurple/protocols/msn/slplink.c

ChangeLog: 

merge of '2d746b537f7c15aca747b7df2e1eedb540eb0baf'
     and 'e09226ff43686401f45368b4047b907c205abfba'