pidgin: 23720684: merge of '2026210de0785811e4681fcc9e988f...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 23720684a7671144bc56d1b20b6a1a0a22862d73
Ancestor: 2026210de0785811e4681fcc9e988fb8d00601ef
Ancestor: eaa137ae31ea2eb08bd918eecc45c5de6e2016a3
Author: paul at darkrain42.org
Date: 2009-02-10T06:08:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/23720684a7671144bc56d1b20b6a1a0a22862d73

Modified files:
        libpurple/privacy.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/transaction.c pidgin/gtkblist.c
        pidgin/gtkdocklet.c

ChangeLog: 

merge of '2026210de0785811e4681fcc9e988fb8d00601ef'
     and 'eaa137ae31ea2eb08bd918eecc45c5de6e2016a3'