pidgin: 19e56805: merge of '1b2d6e3c5b0a2de29e8789d768a61f...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 19e568054a98baec225cea2596fa5446cb353996
Ancestor: 1b2d6e3c5b0a2de29e8789d768a61fd7f2a4b1da
Ancestor: 7399f80ea98924dbddd57be1e652ecbae89d3a8e
Author: markdoliner at pidgin.im
Date: 2008-11-25T01:33:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/19e568054a98baec225cea2596fa5446cb353996

Modified files:
        ChangeLog libpurple/plugins/statenotify.c
        libpurple/protocols/gg/gg.c libpurple/protocols/gg/gg.h
        libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        pidgin/plugins/relnot.c po/hu.po

ChangeLog: 

merge of '1b2d6e3c5b0a2de29e8789d768a61fd7f2a4b1da'
     and '7399f80ea98924dbddd57be1e652ecbae89d3a8e'