pidgin: 800b6ad6: merge of '6b55733f733881e690313c87ac44fb...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 800b6ad635fea0af0870d39010a2a305d65d3bea
Ancestor: 6b55733f733881e690313c87ac44fba18f382ce1
Ancestor: aa1b0003a1e5ecb2e83de16870e1dab4ee4e94cc
Author: darkrain42 at pidgin.im
Date: 2009-07-02T01:52:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/800b6ad635fea0af0870d39010a2a305d65d3bea

Modified files:
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c

ChangeLog: 

merge of '6b55733f733881e690313c87ac44fba18f382ce1'
     and 'aa1b0003a1e5ecb2e83de16870e1dab4ee4e94cc'