pidgin: 71a4d6fa: merge of '12d71b833c7d3451c58c50e6dc621a...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 71a4d6faf379ab067f4fe348b3bdb155aaa651ed
Ancestor: 12d71b833c7d3451c58c50e6dc621a88d678d474
Ancestor: 42f888b4f8e15a19002abe6f40a5d89117ee59a7
Author: rlaager at pidgin.im
Date: 2008-11-14T07:41:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/71a4d6faf379ab067f4fe348b3bdb155aaa651ed

Modified files:
        finch/libgnt/gntentry.c libpurple/plugins/log_reader.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/simple/simple.c libpurple/server.c
        libpurple/util.c libpurple/xmlnode.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/plugins/sendbutton.c

ChangeLog: 

merge of '12d71b833c7d3451c58c50e6dc621a88d678d474'
     and '42f888b4f8e15a19002abe6f40a5d89117ee59a7'