pidgin: 3402413b: merge of '02af4cf0f33f9ec7d46a52cba0e6c4...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 3402413bb520ed29b464408791008454733a56ed
Ancestor: 02af4cf0f33f9ec7d46a52cba0e6c4349f0d6e19
Ancestor: 787e2678ecb0b07e64cbe6ae055962cd65acaeba
Author: rekkanoryo at pidgin.im
Date: 2010-05-13T05:03:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3402413bb520ed29b464408791008454733a56ed

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/libgadu-internal.h
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c po/ChangeLog

ChangeLog: 

merge of '02af4cf0f33f9ec7d46a52cba0e6c4349f0d6e19'
     and '787e2678ecb0b07e64cbe6ae055962cd65acaeba'