pidgin: 29b79286: merge of '773d9ac497939f57a24695fab18a54...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 29b79286f5f28b0f259430f59b8da76617d26e2d
Ancestor: 773d9ac497939f57a24695fab18a54da73d55aeb
Ancestor: 97b2685bf2254aa12c4030861adf51107f366f25
Author: qulogic at pidgin.im
Date: 2009-12-15T08:58:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/29b79286f5f28b0f259430f59b8da76617d26e2d

Modified files:
        ChangeLog libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/switchboard.c

ChangeLog: 

merge of '773d9ac497939f57a24695fab18a54da73d55aeb'
     and '97b2685bf2254aa12c4030861adf51107f366f25'