pidgin: 729b63af: merge of '0627a49f54e3d5317e6a8dd97956ee...

Fri Jun 18 16:15:49 EDT 2010

-----------------------------------------------------------------
Revision: 729b63af926beb43b3250b2a744b67d654624cc7
Ancestor: 0627a49f54e3d5317e6a8dd97956ee2abfa32f9d
Ancestor: 8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258
Author: darkrain42 at pidgin.im
Date: 2010-06-18T20:14:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/729b63af926beb43b3250b2a744b67d654624cc7

Modified files:
        ChangeLog.API libpurple/account.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

merge of '0627a49f54e3d5317e6a8dd97956ee2abfa32f9d'
     and '8bc0a157fd0b23d8e7b6dc9b581fc636e9a0f258'