pidgin: fe8dca15: merge of '1db1fa363515af9bf20cd293f7ff79...

Fri Oct 9 20:56:42 EDT 2009

-----------------------------------------------------------------
Revision: fe8dca15a57dcb53d4af6f8a885925db29ec7bc7
Ancestor: 1db1fa363515af9bf20cd293f7ff7995d16099bb
Ancestor: 3295ae2bdb4e5cae80dc9a5cdd9c53e307d5a255
Author: sadrul at pidgin.im
Date: 2009-10-10T00:56:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fe8dca15a57dcb53d4af6f8a885925db29ec7bc7

Modified files:
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msn/transaction.h pidgin/gtkprefs.c

ChangeLog: 

merge of '1db1fa363515af9bf20cd293f7ff7995d16099bb'
     and '3295ae2bdb4e5cae80dc9a5cdd9c53e307d5a255'