pidgin: 2833fd1d: merge of '55577fa653435bea0213ccd380f914...

Mon Apr 27 12:25:49 EDT 2009

-----------------------------------------------------------------
Revision: 2833fd1d337477c5b6efc4247a9e6127580414ea
Ancestor: 55577fa653435bea0213ccd380f914790714f8a1
Ancestor: d7236accdb3567e97b006e952e0ca3a1a49cc913
Author: sadrul at pidgin.im
Date: 2009-04-27T16:25:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2833fd1d337477c5b6efc4247a9e6127580414ea

Modified files:
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c pidgin/gtkstatusbox.c

ChangeLog: 

merge of '55577fa653435bea0213ccd380f914790714f8a1'
     and 'd7236accdb3567e97b006e952e0ca3a1a49cc913'