pidgin: 65096df3: merge of '46c04c030c2aa142a50b7757576a65...

[timo.jyrinki at iki.fi]

-----------------------------------------------------------------
Revision: 65096df30342ded83da196d39f2823839a692bd6
Ancestor: 46c04c030c2aa142a50b7757576a659b2a5bb670
Ancestor: dce402944e0c7e7fce6947885af42ba1ea7d8a25
Author: timo.jyrinki at iki.fi
Date: 2008-04-02T08:22:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/65096df30342ded83da196d39f2823839a692bd6

Modified files:
        .mtn-ignore ChangeLog ChangeLog.win32 Makefile.am NEWS
        autogen.sh configure.ac finch/libgnt/configure.ac
        libpurple/certificate.c libpurple/network.c
        libpurple/protocols/myspace/myspace.c
        libpurple/win32/global.mak pidgin/gtkdialogs.c
        pidgin/pixmaps/Makefile.mingw
        pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
        pidgin/pixmaps/emotes/default/24/Makefile.mingw
        pidgin/pixmaps/emotes/none/Makefile.mingw
        pidgin/pixmaps/logo.png
        pidgin/win32/nsis/translations/finnish.nsh po/ChangeLog
        po/cs.po po/de.po po/hu.po po/mk.po po/ro.po po/sk.po
        po/sl.po

ChangeLog: 

merge of '46c04c030c2aa142a50b7757576a659b2a5bb670'
     and 'dce402944e0c7e7fce6947885af42ba1ea7d8a25'