pidgin.next.minor: 8b5f9f68: merge of '32cd8507d8b94418ca8f083d855591...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 8b5f9f68fff70e58c4026889da1f1ef949bd7f4f
Ancestor: 32cd8507d8b94418ca8f083d8555916341b47b94
Ancestor: ca1b3ac908985d80ba2b86ef01bc4fcb4cf70fb7
Author: rlaager at pidgin.im
Date: 2008-11-02T19:14:51
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/8b5f9f68fff70e58c4026889da1f1ef949bd7f4f

Modified files:
        COPYRIGHT ChangeLog.API libpurple/account.c
        libpurple/blist.c libpurple/blist.h libpurple/buddyicon.c
        libpurple/conversation.c libpurple/log.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/pounce.c
        libpurple/privacy.c libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/parse.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/send_file.c libpurple/server.c
        libpurple/status.c pidgin/gtkaccount.c pidgin/gtkblist.c
        pidgin/gtkconn.c pidgin/gtksound.c pidgin/plugins/history.c
        pidgin/plugins/ticker/ticker.c po/POTFILES.in

ChangeLog: 

merge of '32cd8507d8b94418ca8f083d8555916341b47b94'
     and 'ca1b3ac908985d80ba2b86ef01bc4fcb4cf70fb7'