pidgin: a5418303: merge of '96cf043274a971d5a2b9e01ef85fb6...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: a541830317e5c36be1c0f2cd7c685f587803d16e
Ancestor: 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1
Ancestor: d70375c084af2336e7fc6646fb778120b05de9a8
Author: paul at darkrain42.org
Date: 2009-03-23T03:06:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a541830317e5c36be1c0f2cd7c685f587803d16e

Modified files:
        finch/gntlog.c finch/gntplugin.c finch/gntroomlist.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c pidgin/gtkaccount.c
        pidgin/gtkdialogs.c pidgin/gtkprefs.c

ChangeLog: 

merge of '96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1'
     and 'd70375c084af2336e7fc6646fb778120b05de9a8'