pidgin: 34d20eeb: merge of '4fc447ffec2a8d0d5fde9ccdb17acf...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 34d20eeb6a0c92c2e677ee6da6e1352688f9a52f
Ancestor: 4fc447ffec2a8d0d5fde9ccdb17acf825a5ccab5
Ancestor: c1573675765ce94fa58152c4fc2af225ff621d47
Author: qulogic at pidgin.im
Date: 2010-05-17T08:04:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/34d20eeb6a0c92c2e677ee6da6e1352688f9a52f

Modified files:
        COPYRIGHT ChangeLog configure.ac
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/snac.c
        libpurple/protocols/yahoo/libymsg.c pidgin/gtkdocklet-gtk.c
        pidgin/gtkimhtml.c pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/english.nsh

ChangeLog: 

merge of '4fc447ffec2a8d0d5fde9ccdb17acf825a5ccab5'
     and 'c1573675765ce94fa58152c4fc2af225ff621d47'