pidgin.next.minor: 9f92dcfd: merge of '123d615deaa8daeeea7d7c341a87ea...

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: 9f92dcfdef33f14b1b048cb8ea7377742e37bb11
Ancestor: 123d615deaa8daeeea7d7c341a87eab4e83a7958
Ancestor: e3b2ac4f2d9e6a6bc13c0394f980b28a75765258
Author: kstange at pidgin.im
Date: 2009-01-06T07:53:19
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/9f92dcfdef33f14b1b048cb8ea7377742e37bb11

Modified files:
        ChangeLog ChangeLog.API libpurple/account.c
        libpurple/blist.c libpurple/buddyicon.c
        libpurple/certificate.c libpurple/cipher.c libpurple/cmds.c
        libpurple/conversation.c libpurple/core.c
        libpurple/desktopitem.c libpurple/ft.c libpurple/idle.c
        libpurple/log.c libpurple/plugin.c libpurple/pounce.c
        libpurple/prefs.c libpurple/privacy.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/simple/simple.c libpurple/proxy.c
        libpurple/proxy.h libpurple/prpl.c libpurple/savedstatuses.c
        libpurple/server.c libpurple/status.c libpurple/stun.c
        libpurple/util.c libpurple/util.h libpurple/whiteboard.c
        libpurple/xmlnode.c pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme.c pidgin/gtkblist-theme.h
        pidgin/gtkblist.c pidgin/gtkprefs.c po/bn.po po/ca.po
        po/ca at valencia.po po/de.po po/fr.po po/hu.po

ChangeLog: 

merge of '123d615deaa8daeeea7d7c341a87eab4e83a7958'
     and 'e3b2ac4f2d9e6a6bc13c0394f980b28a75765258'