im.pidgin.pidgin: 5c36b400eb896d61fc1b8d84dce77a1656e2ca91

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 5c36b400eb896d61fc1b8d84dce77a1656e2ca91
Ancestor: 7e6f3aa974ad4672e16bd0ac3839d416c87160f1
Ancestor: eeef57ab07e5cf7182b765f603a8f2a771081f74
Author: sadrul at pidgin.im
Date: 2008-01-25T02:08:05
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog.API finch/gntblist.c libpurple/connection.c
        libpurple/connection.h libpurple/protocols/gg/gg.c
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/tests/test_util.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '7e6f3aa974ad4672e16bd0ac3839d416c87160f1'
     and 'eeef57ab07e5cf7182b765f603a8f2a771081f74'