pidgin: 150aa701: merge of '2f41200aa97263f1f83de2795ab319...

Tue Apr 28 15:16:09 EDT 2009

-----------------------------------------------------------------
Revision: 150aa7010128787a82ee3eb64eec7907e08235cc
Ancestor: 2f41200aa97263f1f83de2795ab3195d52475b03
Ancestor: c0ad3732e2de434e21818fa9169f9b6835945f74
Author: khc at pidgin.im
Date: 2009-04-28T19:14:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/150aa7010128787a82ee3eb64eec7907e08235cc

Modified files:
        libpurple/core.c libpurple/protocols/yahoo/yahoo.c

ChangeLog: 

merge of '2f41200aa97263f1f83de2795ab3195d52475b03'
     and 'c0ad3732e2de434e21818fa9169f9b6835945f74'