pidgin: 2bc6ae1f: merge of '3817d6fd81f4052bb57cd8ad113d8f...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 2bc6ae1f9731166900b1c3807240d107239050aa
Ancestor: 3817d6fd81f4052bb57cd8ad113d8ffd8028591b
Ancestor: dfd110ca48604f96874c09efb2064228e62475f8
Author: darkrain42 at pidgin.im
Date: 2009-09-29T16:19:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2bc6ae1f9731166900b1c3807240d107239050aa

Modified files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

merge of '3817d6fd81f4052bb57cd8ad113d8ffd8028591b'
     and 'dfd110ca48604f96874c09efb2064228e62475f8'