pidgin: 602d7960: merge of '8ed01adf0c9173501da81537854ce2...

Sat Nov 1 15:10:41 EDT 2008

-----------------------------------------------------------------
Revision: 602d7960555cc685575a2a32397427df3e55a9a7
Ancestor: 8ed01adf0c9173501da81537854ce2954e9805e7
Ancestor: d5e8d63bd0bb69016447e0b053ea96ead0f57504
Author: sadrul at pidgin.im
Date: 2008-11-01T19:07:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/602d7960555cc685575a2a32397427df3e55a9a7

Modified files:
        COPYRIGHT libpurple/protocols/irc/irc.c
        libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/parse.c
        libpurple/protocols/qq/buddy_info.c pidgin/gtkblist.c
        po/POTFILES.in

ChangeLog: 

merge of '8ed01adf0c9173501da81537854ce2954e9805e7'
     and 'd5e8d63bd0bb69016447e0b053ea96ead0f57504'